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
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.  I've already successfully used the crude NEWS file merge
plugin in that proposal for some of my merges of bzr branches.

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 parsing debian/changelog
files?

-Andrew.


-- 
ubuntu-distributed-devel mailing list
ubuntu-distributed-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel


Re: Per-file merge hook for bzr

2010-01-13 Thread Andrew SB
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 parsing 
 debian/changelog
 files?

Bryce from the X team has one. It used to be at
http://people.ubuntu.com/~bryce/scripts/merge_changelog but that link
seems to be broken.

Attached is the version I've been using, but he might have updated it
somewhere since I grabbed it.

- Andrew S


merge_changelog
Description: Binary data
-- 
ubuntu-distributed-devel mailing list
ubuntu-distributed-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel


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 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 repos while
 the projects have moved to git. The imports don't fail as the svn
 repos have been kept around, but lp:gnome-foo will be nearly a year
 behind the actual upstream.
[...]
 I'd be happy to go through and check all the GNOME projects in the
 hottest100. But as I don't have the powers to actually change them,
 I don't know how to make it discoverable for someone who does. A
 message to this list? A question on LP? Would this be a good use of my
 time, or is someone already going to manually look through each of
 these branches as part of this project?

Thanks for pointing this out.

I do have powers to do this, so I've done part of this.  I've gone
through all the gnome-* projects on the +upstreamreport plus a bunch of
others that are listed on https://launchpad.net/gnome, and checked to
see if they have a current import, and created one if it's missing.

I haven't updated the dev focus if the project already had one set,
because I'm not sure if that would break something for someone.  My
guess is it won't break anything, can someone confirm?

Here are my notes of what I did/saw:

Already imported and set as dev focus (no change needed):
-

gnome-settings-daemon
gnome-system-tools


Created git imports for:


at-spi: ~vcs-imports/at-spi/trunk
bug-buddy: .../git-trunk
ekiga: .../git-trunk
eog: .../trunk
file-roller: .../trunk
gconf: .../trunk
gconf-editor: .../trunk
gnome-applets: .../trunk
gnome-bluetooth: .../trunk  [and set as dev focus]
gnome-common: .../trunk
gnome-cups-manager: .../trunk
gnome-desktop: .../trunk
gnome-games: .../trunk
gnome-media: .../trunk
gnome-terminal: .../trunk
gnome-utils: .../trunk
gnome-system-monitor: .../trunk
gnome-screensaver: .../git-trunk


Import already exists but is not dev focus:
---

accerciser: ~vcs-imports/accerciser/main
gedit: ~jjardon/gedit/trunk
gedit-plugins: [now set]
glib: ~jjardon/glib/trunk
gnome-panel: ~vcs-imports/gnome-panel/master


Import exists but fails (even after retry):
---

gnome-control-center
gnome-power-manager


Any project not listed I didn't look at.  As you can see there are now
many branches on this list that aren't set as the development focus that
probably should be.  There are also lots of ~gnome-bzr-mirror branches
that should probably just be deleted, at least the “remote” ones.

-Andrew.


-- 
ubuntu-distributed-devel mailing list
ubuntu-distributed-devel@lists.ubuntu.com
Modify settings or unsubscribe at: 
https://lists.ubuntu.com/mailman/listinfo/ubuntu-distributed-devel