Remote Merge

[Aaron Bentley]

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

Nathaniel McCallum wrote:
> While this method certainly isn't bad, from a ui point of view, doesn't
> it make sense to have a merge_from and a merge_to that does all this
> stuff for you?

It might make sense to have a single command, but calling it merge_*
would not make sense.  In bzr, merge does not change your branch
history, which is what you want the operation to do.  Actually, it also
seems odd that "merge_to sftp://my@remote/branch" would make a commit to
the local branch.

The plan is to do it like this:
bzr branch sftp://my@remote/branch local_branch
cd local_branch
<hack hack>
bzr commit -m "Made some changes"
Local branch is not up-to-date
$bzr pull
$bzr commit

That's not decentralized, but it doesn't sound like you really want
decentralized, at least for this branch.

> bzr branch sftp://my@remote/branch local_branch
> cd local_branch
> <hack hack>
> bzr commit -m "Made some changes"
> bzr merge_to sftp://my@remote/branch
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.1 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFDYUhX0F+nu1YWqI0RAvlcAJ9UiUwMEFgM4j+VkZV7DdBJijwFwgCfYAbV
ApCI8S83exbyWLigQ9wewpo=
=JAER
-----END PGP SIGNATURE-----