Remote Merge

[Aaron Bentley]

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

Jan Hudec wrote:
> Pardon me, but pull is NOT able to merge anything -- that's what makes it
> different from merge.

Pull does a merge, just like Arch and CVS.  But it does not do the merge
if it cannot update the history first.

>>Which is a fuzzy operation, and thus difficult to do from remote.
>>Yes, it is possible. But it means changing merge() and WorkingTree to
>>support operating over a Transport.
>>If people feel it is a must, then we can do it. But that change would
>>propagate to a lot of other code.
> 
> 
> We should NOT do it. Merge result should never ever be placed anywhere else
> than the working copy.

We were discussing doing a merge in the remote working copy.

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

iD8DBQFDYhxJ0F+nu1YWqI0RAgyjAJ4yjInkH7E+fb24dQjTU3JSOWjEzgCfQAZ7
O22ZGkkXyh8mb3UePKTiagg=
=wfa9
-----END PGP SIGNATURE-----