Re: hottest100 (was Re: Bazaar focus for 2.1 and 2.2)

2010-01-13 Thread Andrew Bennetts
Andrew SB wrote: > On Tue, Jan 5, 2010 at 2:33 AM, Martin Pool 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 repos whil

Re: Per-file merge hook for bzr

2010-01-13 Thread Andrew SB
On Wed, Jan 13, 2010 at 7:20 PM, Andrew Bennetts wrote: > Judging from , 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 parsing > debian/change

Per-file merge hook for bzr

2010-01-13 Thread Andrew Bennetts
Hi all, I've implemented a merge hook that allows plugins to implement per-file merge strategies. It's still in review at and will probably need some tweaks before it lands, but I don't expect it to change too much. I