merging debian changelog

[Pierre Habouzit]

On Fri, Jan 11, 2008 at 01:18:15PM +0000, Junichi Uekawa wrote:
> Hi,
> 
> >   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----
> > 
> 
> I'm excited about your code. This is great.

  Well actually it has many pitfalls, like the fact that it reorders
every single changelog entry, which isn't very nice, I should rather try
to keep the ordering, and detect reordering and mark them as conflicts
(which they are actually). Well, some more love is needed, but I settle
some grounds for it, and we'll see where it goes :)

> While I wanted to point this to others, apparently, the list archive
> doesn't like PGP signed mail, so I can't just point people the URL.
> 
> http://lists.madduck.net/pipermail/vcs-pkg/2008-January/000102.html

To madduck: it's not mailman's fault, rather pipermail, that is a real
PoS. Us mhonarch if you want a better archive, or anything else but
pipermail. It's usually really easy to plug in mailman, either as a fake
subscriber, or using the builtin hooks in mailman.

-- 
·O·  Pierre Habouzit
··O                                                madcoder at debian.org
OOO                                                http://www.madism.org
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: not available
Url : http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/attachments/20080111/dad9fd81/attachment.pgp