Re: Symmetric Merge
From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Thu, 22 Mar 2012 16:12:04 +0000 (GMT)
Mark Phippard wrote:
> Julian Foad wrote:
Correct, you would no longer *need* to specify it.
>† Is that how you would ultimately change the test suite ...
I suggest we should leave the --reintegrate option available, meaning "do stricter checks", and after doing the checks it will run the symmetric merge code.† Currently the checks are "no local mods" and "no switched subtrees" and "no cherry picks", in addition to the "no mixed revs unless overridden" that applies to all merges.
In the test suite, at least one test verifies that the --reintegrate option does in fact do the strict WC checks it claims, and so I won't remove that option from the tests.
These kind of checks can be useful for preserving the user's sanity, not just for protecting us against running code in situations we don't fully handle.† We might want to consider increasing the default checks on all merges, for example to include "no switched subtrees".
 The "no cherry picks" check -- I need to check that, as I'm not clear whether/when/how that currently applies.† I expect it currently only checks one direction but should check both directions.† My intention would be to apply it only when "--reintegrate" is given.
This is an archived mail posted to the Subversion Dev mailing list.