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: > james.wes...@ubuntu.com-20090528095612-dxlih6i43v06gn0i > james.wes...@ubuntu.com-20091010135831-db4iogh95oj5v2a0 > $
Blergh. Thanks, I'll look in to what's going on there. James -- pathological merge-package failure with brltty https://bugs.launchpad.net/bugs/493462 You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
