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

[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 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.westby at ubuntu.com-20090528095612-dxlih6i43v06gn0i james.westby at ubuntu.com-20091010135831-db4iogh95oj5v2a0
$

ProblemType: Bug
Architecture: amd64
Date: Sun Dec  6 23:04:13 2009
DistroRelease: Ubuntu 10.04
Package: bzr-builddeb 2.2~ubuntu3
PackageArchitecture: all
ProcEnviron:
 PATH=(custom, user)
 LANG=en_US.UTF-8
 SHELL=/bin/bash
ProcVersionSignature: Ubuntu 2.6.32-6.8-generic
SourcePackage: bzr-builddeb
Tags: lucid
Uname: Linux 2.6.32-6-generic x86_64

** Affects: bzr-builddeb (Ubuntu)
     Importance: Undecided
         Status: New


** Tags: amd64 apport-bug lucid

-- 
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 at lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs