[MERGE] enhanced mv command

[Aaron Bentley]

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

Aaron Bentley wrote:
> Marius Kruger wrote:
> 
>>>What I was thinking is also providing a small python script which helps
>>>you remove
>>>all trailing white space in all the .py files.
>>>Then all diverging branches must just apply it to themselves first before
>>>attempting to merge back in.
> 
> 
> This still breaks merge-format=weave, because that relies on annotations.

I should also add that it breaks other merge scenarios too, because it
does not change whitespace in the base revision.

So if you have
Base: "Hello "
This: "Hello"
Other: "Pizza"

The desired merge output is "Pizza" (who doesn't like pizza? :-).  But
you actually get a conflict, because all three texts differ from one
another.

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

iD8DBQFFp6B/0F+nu1YWqI0RAgTnAJ9jHDvEfcrMp/ElD6HLDPwDMEpWSgCffUvM
QvoRChFtubPf77ZLoQlzQqI=
=yxIt
-----END PGP SIGNATURE-----