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