Re: Per-file merge hook for bzr

2010-01-14 Thread Michael Bienia 
On 2010-01-14 11:20:00 +1100, 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/changelog
> files?

"from debian_bundle import changelog" (package is python-debian)

It contains a class for parsing debian/changelog and also a class for
versions (including policy-compliant comparison as it uses python-apt
for it).

You might perhaps also want to look at the code for MoM (Merge-o-Matic;
https://code.edge.launchpad.net/~ubuntu-core-dev/merge-o-matic/trunk) to
see how it prepared its merges (including debian/changelog).

Michael

-- 
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
 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/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

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

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/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