Bug in reweave

[Robert Collins]

On Thu, 2006-02-02 at 14:17 +1100, Martin Pool wrote:
> 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.


I think we need a reconciliation tool : I suspect that conversions from
arch will generate this a -lot-. [and from any system that allows less
than total history to exist]


Consider an arch branch in two archives. If you convert the parent
branch, and then convert the child branch without access to the parent,
you will get a last-modified on all the files of the 'base-0' or tag
point.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060206/ccf05c65/attachment.pgp