Bug in reweave

[Martin Pool]

On 26 Jan 2006, John A Meinel <john at arbash-meinel.com> wrote:
 
> I think what happened is that in the upgrade code, in one branch it
> actually had the revision, and could attribute the text to the correct
> revision, in the other branch, it had to guess, so it guessed *this*
> revision. Now they disagree, so now they can't be merged.

Yes, I think that's correct.  So the problem can apparently only occur
when you do an upgrade from an ancient pre-weave version, and the
upgrade is done independently in two branches which have different ghosts.
So as you say it's probably best to just branch from the mainline again.
-- 
Martin
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060202/5e0fa971/attachment.pgp