using per file merge bases ?

[Aaron Bentley]

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

Robert Collins wrote:
| Yah. I think the ancestor selection algorithm did the right thing as far
| as it can tbh - its that we need a virtual tree for this: on a per file
| basis, all of the new file versions have common ancestors, theres no
| 'new files' at all.

Oh, I'd always assumed you were talking about the file contents, not the
inventory entries.  I think if we could do a weave merge on the
inventory values (i.e. scalar merges), we'd be able to handle these
cases better.  Or at least, we get to try out some of those algorithms
Bram Cohen keeps coming up with.

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

iD8DBQFDwbLV0F+nu1YWqI0RAt46AJ9L+fvu0kb1qMhhkhWs3Zc5dB3y1ACfbpnm
QDv0IO5pT9tcmRMdKoCOXEk=
=hZ1M
-----END PGP SIGNATURE-----