Comments on: 3-way merge of Debian changelog files http://raphaelhertzog.com/2009/10/08/3-way-merge-of-debian-changelog-files/ Insider infos, master your Debian/Ubuntu distribution Tue, 15 May 2012 08:29:16 +0000 hourly 1 http://wordpress.org/?v=3.3.2 By: Sami http://raphaelhertzog.com/2009/10/08/3-way-merge-of-debian-changelog-files/#comment-3017 Sami Mon, 12 Oct 2009 06:10:18 +0000 http://raphaelhertzog.com/?p=223#comment-3017 including this in git-buildpackage would be a bad thing.. it should be included in devscripts with a more generic name. We need a generic 3-way merge tool for changelogs for all developers, not just git users. including this in git-buildpackage would be a bad thing.. it should be included in devscripts with a more generic name. We need a generic 3-way merge tool for changelogs for all developers, not just git users.

]]> By: Vincent http://raphaelhertzog.com/2009/10/08/3-way-merge-of-debian-changelog-files/#comment-3016 Vincent Fri, 09 Oct 2009 20:25:00 +0000 http://raphaelhertzog.com/?p=223#comment-3016 This tool seems very interesting. I hit the 3-way merge of Debian changelog files problem when I'm backporting some of my packages. I will look if this tool can merge testing and backport changelogs correctly. This tool seems very interesting. I hit the 3-way merge of Debian changelog files problem when I’m backporting some of my packages. I will look if this tool can merge testing and backport changelogs correctly.

]]> By: Buxy http://raphaelhertzog.com/2009/10/08/3-way-merge-of-debian-changelog-files/#comment-3015 Buxy Fri, 09 Oct 2009 06:22:01 +0000 http://raphaelhertzog.com/?p=223#comment-3015 @James, a pity that his script did not get announced/publicized a bit more. @Stefano, it's perl so I doubt that the git-buildpackage maintainer will like it. In any case, it's not yet ready to enter Debian, it depends heavily on dpkg-dev perl modules whose API are not officially stable. I'm working on creating a libdpkg-perl but I'm not there yet. Also it can be used outside of git despite its name so I'm not yet sure. I might want to rename it and keep it separate. @James, a pity that his script did not get announced/publicized a bit more.

@Stefano, it’s perl so I doubt that the git-buildpackage maintainer will like it. In any case, it’s not yet ready to enter Debian, it depends heavily on dpkg-dev perl modules whose API are not officially stable. I’m working on creating a libdpkg-perl but I’m not there yet. Also it can be used outside of git despite its name so I’m not yet sure. I might want to rename it and keep it separate.

]]> By: Stefano Zacchiroli http://raphaelhertzog.com/2009/10/08/3-way-merge-of-debian-changelog-files/#comment-3014 Stefano Zacchiroli Thu, 08 Oct 2009 21:47:25 +0000 http://raphaelhertzog.com/?p=223#comment-3014 Pretty please, you, random packager :-), do not attempt to package this as a separate package. The most appropriate place is to submit it as an add-on for git-buildpackage. Pretty please, you, random packager :-) , do not attempt to package this as a separate package. The most appropriate place is to submit it as an add-on for git-buildpackage.

]]> By: James Vega http://raphaelhertzog.com/2009/10/08/3-way-merge-of-debian-changelog-files/#comment-3013 James Vega Thu, 08 Oct 2009 20:38:40 +0000 http://raphaelhertzog.com/?p=223#comment-3013 Pierre Habouzit came up with something similar almost 2 years ago now[0]. :) I wonder if there's soom room for consolidating any differences in the two approaches. http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/2008-January/000105.html Pierre Habouzit came up with something similar almost 2 years ago now[0]. :) I wonder if there’s soom room for consolidating any differences in the two approaches.

http://lists.alioth.debian.org/pipermail/vcs-pkg-discuss/2008-January/000105.html

]]> By: Carl http://raphaelhertzog.com/2009/10/08/3-way-merge-of-debian-changelog-files/#comment-3012 Carl Thu, 08 Oct 2009 20:09:11 +0000 http://raphaelhertzog.com/?p=223#comment-3012 Unrelated, but wow your avatar has the perfect floating head thing going for it. Some do okay but I actually pictured your head floating in mid-air. Nice job ;) Unrelated, but wow your avatar has the perfect floating head thing going for it. Some do okay but I actually pictured your head floating in mid-air. Nice job ;)

]]>