User1: User2 Oh, and yes, I did get the answer in there.
User2: heh
User2: I wouldn't have a clue what you were talking about if this channel wasn't so dead ...
User1: FWIW, https://bugs.launchpad.net/bzr/+bug/1078211 it looked like.
User3: Ubuntu bug 1078211 in Bazaar "lp-propose $BRANCH always prefers the parent branch" [Low,Confirmed]
User4: Is anyone using changelog_merge? It's supposed to be for GNU-format ChangeLog files. Can it be used for debian/changelog as well?
User5: User4 no, there is a separate merge hook for debian/changelog
User5: which is a part of the bzr-builddeb plugin
User4: jelmer, o cool... I'll check it out
User4: jelmer, specific issue I'm trying to solve is changelog merge conflicts due to developer commits editing the file at/around the same place...
User4: jelmer, I'm not sure if this plugin helps
User4: I don't want to change how we manage packages.. just need help with merging...
User5: User4 that is what the hoek does
User5: User4 the plugin contains various tools (including this hoek) for managing Debian packages in bzr
User5: Grr, Dutch autocorrect
User5: I meant hook rather than hoek, obviously
User4: jelmer, the documentation goes into talking abt complex package mgtmt discussion, so it wasn't obvious to me how I could use it to merge...
User5: User4 I think the hook is enabled by default if you have the package and Debian devscripts installed
User4: jelmer, specifically I have a branch with a one-line changelog addition, while the trunk (let's say) has another one-line commit that got ahead causing a merge-conflict... how would one use this hook to merge cleanly? If you know of any examples of this, it'd greatly help
User5: User4 the hook should take care of that automatically while you merge
User4: jelmer, sounds like exactly what I need... I'll dig more
User4: thanks
bzr
Ubuntu IRC