Remote Merge

[Aaron Bentley]

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

Matthieu Moy wrote:

> Another option: from the inventories of the local and remote files,
> compute the list of files to be updated, and check only those files.

You know, if it comes down to that, we might be able to do remote merge
with acceptable efficiency-- we always do that kind of filtering before
we compare to the working tree, even locally.  Or we could just bail if
THIS != BASE, as you suggest.

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

iD8DBQFDYhuf0F+nu1YWqI0RAmoZAJ9qbvaIjbLMfl5BW+BGjUuwrRhJnACfZM7X
FrWugjlwXGieJDxXuJCdUb0=
=PxGl
-----END PGP SIGNATURE-----