Comment 5 for bug 244115

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

Robert Collins wrote:
> To expand on Aaron's comment:
> Whiel both trees have libmokoui before the merge, it is a cherrypick merge, which means that the mkdir() of libmokoui in trunk is not being copied across by the merge code. So the libmokoui directory is not being copied across.
>
> One thing that I think we could tweak to improve matters, is that when
> this happens (the parent not being propogated), rather than moving the
> existing directory to NAME.moved, and creating a new NAME with only the
> merged files in it, we should keep the existing directory as NAME, and
> create the directory-with-the-missing-id as NAME.conflicts. This would
> stop the user having to rename them back into place.

The theory has always been that it's easier to revert a change than to
perform an action. So if only one of THIS and OTHER can have the name
"libmoku", we give it to the OTHER copy.

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

iD8DBQFIaVgI0F+nu1YWqI0RAq6rAJ0ZvKyXTI6gvlWX6S+QMPzrPlbf+gCdHTLi
fYTnvnwAG/TZwptOsDtUkfQ=
=m4YU
-----END PGP SIGNATURE-----