patch versus 3-way merge for moved contents

[Aaron Bentley]

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

Jan Hudec wrote:
> The only solution I could see would be if the weave somehow recorded, that
> the lines were swapped. However it is pretty hard to guess when that
> happened.

Bram Cohen (yes, the bittorrent guy) is working on Edge Versioning for
his Codeville VCS: http://revctrl.org/EdgeVersioning.  This would
probably support merges with lines moved and swapped.

This is definitely research project material at the moment, but if he
comes up with something great, you can bet we'll steal it.

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

iD8DBQFDYh3+0F+nu1YWqI0RAmBzAJkB0JgBi4rVlxt8hStvIQCfeYf5VQCaAqkL
h/YtU0ucha07VSpGe3W5QXI=
=vy6f
-----END PGP SIGNATURE-----