bzr-builddeb

  1. Bug #619614
  2. Comment #4

Comment 4 for bug 619614

Revision history for this message
Martin Pool (mbp) wrote : Re: [Bug 619614] Re: InconsistentDelta during merge-upstream

On 19 August 2010 13:01, Andrew Bennetts <email address hidden> wrote:
> FWIW: merge-upstream from the bzr-2.2.0.tar.gz (from
> http://edge.launchpad.net/bzr/2.2/2.2.0/+download/bzr-2.2.0.tar.gz)
> works just fine, as does the merge-upstream with the
> bzr_2.2.0.orig.tar.gz that "bzr merge-upstream -r bzr-2.2.0
> $path_to_bzr_trunk" generates before it fails.
>
> So it's specifically due to dealing with the (unrelated) upstream
> branch.

Right, that's what I saw too.

--
Martin