On Mon, Jan 07, 2008 at 11:55:07PM +0000, Pierre Habouzit wrote: > On lun, jan 07, 2008 at 10:43:58 +0000, Pierre Habouzit wrote: > > I know this is a painful thing to do (if you consider the inherent > > triviality of it), hence I ended up writing a custom merger. This is all > > very sketchy, but I'm sure people will enhance it :) > > Here is a better version, that I believe can be used as a git merge > driver using this configuration snipplet: > > [merge "merge-debchangelog"] > name = Debian Changelog merge driver > driver = /path/to/merge-debchangelog.py %O %A %B %A > > and then, if I'm correct, you can in the .gitattribute of your debian/ > directory set: > > ----8<---- > /changelog merge=merge-debchangelog > ---->8----
ok, it's actually in debian/.gitattributes with an 's' and the line is without a leading slash: changelog merge=merge-debchangelog and it works remarkably well \o/ Now $someone just has to make the merge of a given version chunk more intelligent (using diff3 e.g. and disregarding the trailing line, or keeping the one with the "biggest" date, whichever you see fit) and it should merge debian/changelogs without a glitch in 99% of the cases :) some merge-debchangelog pr0n: $ git merge debian-experimental merging debian/changelog using Debian Changelog merge driver Merge made by recursive. debian/changelog | 19 +++++++++++++------ 1 files changed, 13 insertions(+), 6 deletions(-) -- ·O· Pierre Habouzit ··O [EMAIL PROTECTED] OOO http://www.madism.org
pgplQUMjuC6RD.pgp
Description: PGP signature
_______________________________________________ vcs-pkg mailing list [email protected] http://lists.madduck.net/listinfo/vcs-pkg
