Re: Symmetric Merge -- switched subtrees [was: no local mods or switched subtrees by default]

Hi Paul, just one clarification request on a very brief skimmed reading:

>    * If the incoming change deletes the path SS, then it is interpreted as
> deleting the entry SS from SSP's list of children.
>
> Correct, SS_at_BASE is deleted, *but* the repository location represented
> by the switched subtree is also deleted -- Both are deleted.

Are you saying that if we commit this merge, it will delete the repository path SS from SS's parent-in-the-repository, and also delete the repository path SS_at_BASE from SS_at_BASE's parent-in-the-repository?  Well, I never would have guessed that!

>  Not sure
> what the ideal behavior is, but this is nothing new (it pre-dates
> merge-tracking).  Honestly this particular use-case fell through the
> cracks, I don't recall it ever being discussed.

OK, and thanks for the details; I'll study the rest on Monday.

- Julian
Received on 2012-04-20 19:13:00 CEST