No, I don't have any po_merge configuration in locations.conf or
branch.conf.
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1014802
Title:
merge-upstream changes po files behind your back
To
@Andreas: The default values for the plugin may still apply to your
setup.
po_merge.po_dirs = po,debian/po
po_merge.po_glob = *.po
po_merge.po_glob = *.pot
po_merge.command = 'msgmerge -N {other} {pot_file} -C {this} -o
{result}'
See 'bzr help po_merge' and set what is appropriate for your use
That's why I opened this bug. I find that behavior unexpected. I asked
to merge a one-liner typo fix, and got a huge diff where I challenge the
reviewer to find it.
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
I don't get it, your report ended with: Maybe we need an option to not
do this.. You *do* have options.
Additionally, as mentioned in 'bzr help po_merge', you can even redo the
merge if the results don't suit your needs.
--
You received this bug notification because you are a member of Ubuntu
bug #884270 records most of the discussion leading to the plugin
introduction
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1014802
Title:
merge-upstream changes po files behind your back
To
And made me lose time, because reviewing a 200kb+ debdiff and chasing
that po file change wasn't fun.
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1014802
Title:
merge-upstream changes po files
Yeah, provided you know there is something calling po_merge acting
behind your back. Then you can search for its documentation, and finally
how to disable it.
This bug is about it being enabled by default I guess. bzr is a version
control system, with some steroids. I think this behavior in
** Package changed: bzr-builddeb (Ubuntu) = bzr
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1014802
Title:
merge-upstream changes po files behind your back
To manage notifications about this bug
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
** Attachment added: good-diff.diff
https://bugs.launchpad.net/bugs/1014802/+attachment/3195085/+files/good-diff.diff
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
https://bugs.launchpad.net/bugs/1014802
Title:
merge-upstream
** Patch added: merge-upstream.diff
https://bugs.launchpad.net/ubuntu/+source/bzr-builddeb/+bug/1014802/+attachment/3195086/+files/merge-upstream.diff
--
You received this bug notification because you are a member of Ubuntu
Bugs, which is subscribed to Ubuntu.
11 matches
Mail list logo
