reverse merge....

[Aaron Bentley]

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

Matthieu Moy wrote:
> Indeed, I wonder if it would be worth having a "bzr connect"/"bzr
> disconnect" (most likely as a plugin) to say wether commit should be
> local or not. I think I would be using it.

unbind/bind is kinda like that.

>>Certainly possible.  I wonder whether bzr merge; bzr pull --overwrite
>>could/should achieve this?
> 
> 
> I'd say no, since after "bzr merge", you have the remote changes
> as pending merges in your tree, not the local ones. But I may have
> missed something.

Pull --overwrite will change the last_revision of the tree, but it could
preserve the outstanding changes, rather like update.

> Indeed, a swiss-army-knife would be 
> "bzr convert-commits-to-pending-merge -r ...". It could be funny to
> have it also (but certainly not in the core, no need to bother the
> normal user with one more command).

Well, that *is* one of the beauties of the plugin system.

> Then, "merge --reverse" could be built like this:
> 
> $ bzr convert-commits-to-pending-merge -r ancestor:remote-branch
> $ bzr pull

Right.

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

iD8DBQFFBW560F+nu1YWqI0RAlbTAKCAuUj+0Di7DUz8V0dqYkW0C/MKQgCeNFzl
NcEoSr+Mehr/iUTwywKltFw=
=SxhR
-----END PGP SIGNATURE-----