Comment 12 for bug 494269

Revision history for this message
James Westby (james-w) wrote : Re: [Bug 494269] Re: conflict on deleted directory?

On Wed, 06 Jan 2010 21:38:27 -0000, John A Meinel <email address hidden> wrote:
> This may be related to a similar bug. Where Alexander Belchenko noted
> that "bzr init && bzr add --file-ids-from" doesn't work perfectly in 2a.
> Because each tree gets a different root id.
>
> In a quick test, it looks like "bzr init" creates a randomly generated
> root-id. And so "add --file-ids-from" doesn't get a chance to set the
> root id to something special.

Yep, I discovered this too when we moved to 2a.

> So some ideas:
>
> 1) However you are creating these imports, we should try to make sure
> the root ids are the same. This probably needs to happen at
> 'initialization' time.

There is code that is supposed to handle this, but it may be incomplete.

> 2) Our code should handle root-ids changing in a better way. Updating
> from a revision with one root-id to a revision with a different root-id
> should not leave the tree in a state that thinks it still is using the
> old revision-id. And reverting when there is a root-id change should
> 'just work' not leave us in a broken state.

Thanks,

James