Ubuntu
bzr-builddeb package

  1. Bug #493462
  2. Comment #2

Comment 2 for bug 493462

Revision history for this message
James Westby (james-w) wrote : Re: [Bug 493462] [NEW] pathological merge-package failure with brltty

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 source and target have
> diverged. Unfortunately, the attempt to fix this problem resulted in conflicts.
> Please resolve these, commit and re-run the "merge-package" command to finish.
> Alternatively, until you commit you can use "bzr revert" to restore the state
> of the unmerged branch.
> $
> <fix, fix>
> $ bzr commit -m "merge upstream 4.1"
> [...]
> Committed revision 46.
> $ bzr merge-package lp:debian/sid/brltty
> [...]
> Committed revision 9.
> bzr: ERROR: Revisions have no common ancestor:
> <email address hidden>
> <email address hidden>
> $

Blergh.

Thanks, I'll look in to what's going on there.

James