[MERGE] avoid spurious conflicts

[Robert Collins]

On Sun, 2006-04-02 at 17:48 -0400, Aaron Bentley wrote:

> You're asking what happens when we try to transform "source tree" into
> "new tree"?
> 
> Nothing bad.  After the first pass, you'll wind up with a transform that
> wants to produce two adirs, one versioned, one not.
> 
> After we resolve conflicts, we detect conflicts again (up to 10 times).
> So in the second pass, we will rename the unversioned adir to adir.moved.

Yes, I was.. thanks


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: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060403/b86661ba/attachment.pgp