reverse merge....

[Aaron Bentley]

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

David Allouche wrote:
> Matthieu Moy wrote:
> 
> When I discussed "switch" with Robert Collins, he said that it should do
> something like that when switching a heavy checkout. I do not remember
> the specifics, I never quite understood the intended semantics of heavy
> checkouts.
> 
> In any case, I want to keep the current functionality of switch for
> light checkouts, I use it every day.

I think the idea would be to add an option, e.g.

switch --merge foo

IIRC, switch does a merge with
BASE = wt.basis(), THIS = wt, OTHER = other_branch.basis()

Doing --merge would change the BASE to be calculated using
common_ancestor in the normal way, and set other_branch.last_revision()
and wt.parent_ids() as the parents.

But since we're talking about doing merges, it might make more sense to
have merge --switch, since merge has all the UI for specifying merge
types already.

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

iD8DBQFFErQC0F+nu1YWqI0RAv++AJ9wIN9ZBs06VWZuuEZWjQOLTNNy1gCfYCN9
uuzppK3MVgNISN/SCQf1O+o=
=YpP8
-----END PGP SIGNATURE-----