[00:32] SamB: Oh, and yes, I did get the answer in there. [00:33] heh [00:33] I wouldn't have a clue what you were talking about if this channel wasn't so dead ... [00:34] FWIW, https://bugs.launchpad.net/bzr/+bug/1078211 it looked like. [00:34] Ubuntu bug 1078211 in Bazaar "lp-propose $BRANCH always prefers the parent branch" [Low,Confirmed] === thumper-afk is now known as thumper === vila_ is now known as vila === thrustcore`waway is now known as thrustcore [11:10] Is anyone using changelog_merge? It's supposed to be for GNU-format ChangeLog files. Can it be used for debian/changelog as well? [11:11] camako: no, there is a separate merge hook for debian/changelog [11:11] which is a part of the bzr-builddeb plugin [11:11] jelmer, o cool... I'll check it out [11:54] jelmer, specific issue I'm trying to solve is changelog merge conflicts due to developer commits editing the file at/around the same place... [11:54] jelmer, I'm not sure if this plugin helps [11:55] I don't want to change how we manage packages.. just need help with merging... [12:08] camako: that is what the hoek does [12:09] camako: the plugin contains various tools (including this hoek) for managing Debian packages in bzr [12:09] Grr, Dutch autocorrect [12:10] I meant hook rather than hoek, obviously [12:11] 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... [12:13] camako: I think the hook is enabled by default if you have the package and Debian devscripts installed [12:14] 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 [12:15] camako: the hook should take care of that automatically while you merge [12:18] jelmer, sounds like exactly what I need... I'll dig more [12:18] thanks === Peng_ is now known as Peng