pathological merge-package failure with brltty

[Steve Langasek]

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>
$

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

[James Westby (james-w)]

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

[James Westby (james-w)]

Hi,

This happens when you merge-package outside a shared repo. You can do
it inside one for now as a workaround. I've just committed a fix upstream.

Thanks,

James

[Launchpad Janitor (janitor)]

This bug was fixed in the package bzr-builddeb - 2.3

---------------
bzr-builddeb (2.3) experimental; urgency=low

  [ James Westby ]
  * Some support for v3 source formats (Closes: #562991)
    - Those that look quite a lot like v1 are supported well.
    - .tar.bz2 tarballs are supported for import, building, merge-upstream,
      etc., but only enabled for the latter with a --v3 switch for now.
    - Multiple orig.tar.gz is not supported.
    - .tar.lzma is not supported awaiting pristine-tar support.
  * New "dh-make" command ("dh_make" alias) that allows you to start
    packaging, either in an empty branch, or based on an upstream branch.
  * Fix merge-package for native packages (LP: #476348)
  * debian/changelog merge hook to reduce the manual conflict resolution
    required there. Thanks to John Arbash Meinel and Andrew Bennetts
    (LP: #501754).
    - Requires newer bzr.
  * Fix merge-package outside a shared repo (LP: #493462)
  * Fix exporting of symlinks (LP: #364671)
  * Add --force option to merge-upstream which may help certain people.
  * Use system configobj if the bzr copy isn't available. Thanks Jelmer.
  * Make merging multiple-root branches work. Thanks Robert Collins.
  * Disentangle from bzrtools. Thanks Max Bowser.

  [ Jelmer Vernooij ]
  * Bump standards version to 3.8.4.
  * Fix formatting in doc-base.
 -- Jelmer Vernooij <email address hidden> Sat, 13 Feb 2010 01:30:21 +0000