merge-upstream changes po files behind your back
Bug #1014802 reported by
Andreas Hasenack
This bug affects 1 person
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Low
|
Unassigned |
Bug Description
I found this unexpected. While updating landscape-client to 12.05, with an upstream tarball, merge-upstream changed the po files by normalizing them.
Here is the diff by just replacing the po/* files with the upstream version:
http://
Here is the diff produced after running bzr merge-upstream:
http://
Maybe we need an option to not do this.
tags: | added: check-for-breezy |
To post a comment you must log in.
Hi,
The merge is done by the po_merge plugin.
http:// doc.bazaar. canonical. com/beta/ en/whats- new/whats- new-in- 2.5.html# po-merge- plugin
bzr-builddeb might be causing this to activate when using in bzr branches, but I don't think
so. Do you have the config described in that link set on your machine?
Thanks,
James