Remote Merge

[John A Meinel]

Matthieu Moy wrote:
> John A Meinel <john at arbash-meinel.com> writes:
> 
>> The hard part is that both pull and merge are able to merge the changes
>> into the working tree.
>> Which is a fuzzy operation, and thus difficult to do from remote.
> 
> In the case of "push", it is not fuzzy. After the push, the remote
> working tree should be exactly the same as the local one. The history
> may differ. The difficult thing would be a "rmerge", doing the
> symetrical operation of "merge".
> 
> It should even be relatively easy to do efficiently: you can get the
> inventory of the remote tree, see which files differ from your local
> inventory and upload only those ones.
> 

Actually, it should be equal to the contents of the revision. Not the
current working tree.
Because you can do a partial commit. Or push after making changes, but
before you commit a second time.

It still means that you need to read all of the remote working
directory, to make sure there isn't garbage there that needs to be
cleaned up. (Say a file was deleted).

It is still more difficult, but that doesn't mean it is impossible.

John
=:->


-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 249 bytes
Desc: OpenPGP digital signature
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20051027/f6a2a55b/attachment.pgp