[22:17] <thomi> wgrant: does launchpad merge proposal diff generation use any non-standard bzr options?
[22:18] <thomi> I ask because https://code.launchpad.net/~autopilot/autopilot/trunk/+merge/250402 shows a merge conflict, but the exact same merge works fine on my laptop
[22:19] <thomi> also, the diff on that page shows that bzr is seeing changes in trunk that aren't there... or at least, don't need to be changed in the /1.5 branch - very odd
[22:19] <wgrant> Hum, why on earth are you merging trunk into 1.5?
[22:19] <wgrant> That makes like no sense.
[22:19] <thomi> wgrant: don't ask - it's a long story
[22:20] <thomi> wgrant: have you noticed that the entire UE release process makes no sense? :D
[22:20] <wgrant> thomi: The conflicts are in the changelog. You'll have a Bazaar plugin that knows how to merge debian/changelog, but LP does not.
[22:21] <wgrant> The diff matches what I get locally, except that debian/changelog merges properly locally.
[22:21] <thomi> ahhh 'changelog_merge'
[22:21] <wgrant> I think it's builddeb, actually.
[22:21] <wgrant> changelog_merge isn't for Debian changelogs.
[22:21] <thomi> oh ok
[22:21] <thomi> oh, right
[22:21] <wgrant> yeah:
[22:21] <wgrant> changelog_merge 2.7.0dev1 Merge hook for GNU-format ChangeLog files
[22:22] <thomi> wgrant: so the correct way to resolve this would be to do the merge locally without that plugin enabled, resolve the conficts etc?
[22:22] <wgrant> Yeah.
[22:23] <thomi> thanks
[22:23] <thomi> I never realised that plugins can affect merge results
[22:35] <veebers> wgrant: is there a way to temp disable a bzr plugin?
[22:36] <wgrant> veebers: The BZR_DISABLE_PLUGINS envvar.
[22:36] <veebers> wgrant: ah awesome, thanks for the help :-)