Remote Merge

[Aaron Bentley]

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

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]

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

Right.

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

iD8DBQFDYVkK0F+nu1YWqI0RAnPEAJsGi46Cl8SIwoFHCPgwZ7pNrvEWSACeNS7+
RoFSd6oHRTlB4KUzz9BpqLw=
=5BHl
-----END PGP SIGNATURE-----