Remote Merge

[John A Meinel]

Aaron Bentley wrote:
> John A Meinel wrote:
>>> Aaron Bentley wrote:
>>> Speaking of this, I just wanted to check, if you do a "bzr pull" with
>>> uncommitted changes in you working directory, it will do a merge against
>>> the working tree, right?
> 
> Right.  Just like cvs update.
> 
>>> So if we want "bzr push" to support remote working directories
> 
> [but I don't want to, and neither does Robert Collins]

Neither do I. I think it was suggested by Matthieu Moy that it should be
a relatively simple operation.
And I suppose that it would be if we could do a straight copy of the
changes, rather than a merge (assume that the remote tree is pristine).

I personally don't have a problem having "bzr push" only update the
.bzr/ data, since any "bzr pull" from that tree will regenerate the
working directory from local contents.

> 
>>> , we would
>>> have to do a real merge into the remote tree. Because it may not have a
>>> clean working directory.
> 
> Right.
> 
> Aaron

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/0912a776/attachment.pgp