Hi all,
I've implemented a merge hook that allows plugins to implement per-file merge
strategies. It's still in review at
https://code.launchpad.net/~spiv/bzr/per-file-merge-hook-491711/+merge/17279
and will probably need some tweaks before it lands, but I don't expect it to
change too much.
On Wed, Jan 13, 2010 at 7:20 PM, Andrew Bennetts
andrew.benne...@canonical.com wrote:
Judging from https://bugs.edge.launchpad.net/bzr/+bug/491711, the next step
for udd is to implement a hook to merge debian/changelog in bzr-builddeb. Is
there some code already written for merging or at least
Andrew SB wrote:
On Tue, Jan 5, 2010 at 2:33 AM, Martin Pool m...@canonical.com wrote:
To be useful, this query needs some measurement of whether the branch is
fresh.
This is especially true for GNOME products. A number of branches
currently marked as working are still pointed at old svn
