[MERGE] Conflict handling docs

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

James Westby wrote:
> On (24/07/07 17:25), Aaron Bentley wrote:
>>>> +Sometimes Bazaar will attempt to create a file whose parent directory is not
>>>> +versioned.  This happens when the directory has been deleted in the target,
>>>> +but has a new child in the source, or vice versa.  In this situation, Bazaar
>>>> +will version the parent directory as well.  You may rename either file, if you
>>> What does "either file" refer to?
>> Either the directory or the file.
> 
> Ok, but everywhere else you have been explicit about what will be seen
> in the working tree (THIS etc.). Here that is implicit, and not exactly
> clear to me. I can only see one file involved in the conflict

One file is the directory that has been deleted by one tree.  The other
file is the file that was added by the other tree.  The creation of the
file conflicts with the deletion of the directory.

>, two if
> you count the directory, but even then it's not clear how renaming would
> solve this conflict. Is this one of the cases where you get a "file" and
> "file.moved" or similar?

When one tree has deleted a directory and the other has added a file to it
 - you may wish to move the file into a new directory and delete the old
   directory.
 - you may wish to keep the file and the directory with exactly the same
   name
 - you may wish to rename either or both of them.

> Apart from that +1, or whatever the vote is in the new system for "go
> ahead and merge it, perhaps considering these comments first".

I guess that's "approve" with comments.

>  I think this is good clear documentation that could be very valuable to some
> people, and has taught me some things as well.

Great.

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.6 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFGpnUP0F+nu1YWqI0RAkuUAJ41TTsJ78juve1yQUAAk58MdlWI6QCfSWWP
qXR+5+ZdmC5D4o/PBRsoKFs=
=0JyP
-----END PGP SIGNATURE-----