Re: [Bug 493462] [NEW] pathological merge-package failure with brltty

2009-12-07 Thread James Westby
On Mon Dec 07 07:08:28 UTC 2009 Steve Langasek wrote: > Public bug reported: > > Binary package hint: bzr-builddeb > > Nice failure mode when trying to merge up the brltty package for lucid: > > $ bzr merge-package lp:debian/sid/brltty > [...] > bzr: ERROR: The upstream branches for the merge so

[Bug 493462] [NEW] pathological merge-package failure with brltty

2009-12-06 Thread Steve Langasek
Public bug reported: Binary package hint: bzr-builddeb Nice failure mode when trying to merge up the brltty package for lucid: $ bzr merge-package lp:debian/sid/brltty [...] bzr: ERROR: The upstream branches for the merge source and target have diverged. Unfortunately, the attempt to fix this p