On Thu, Mar 22, 2012 at 12:12 PM, Julian Foad <julianf...@btopenworld.com> wrote: > 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"[1], in addition to the "no mixed revs unless > overridden" that applies to all merges.
Let me just see if I understand what you are saying here (only talking about what is now a "reintegrate" scenario): 1) User could just run svn merge. Merge will do the right thing, but the existing reintegrate checks would not happen. 2) User could also use svn merge --reintegrate. Merge would still do the right thing, but the additional checks would happen. Or are you saying that 1 and 2 will be the same no matter what and the code will just figure it out? As an API consumer via JavaHL, I would assume I will just have a single merge API I can run, as opposed to two today. And the API will do the right thing? -- Thanks Mark Phippard http://markphip.blogspot.com/
