[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Symmetric Merge

From: Mark Phippard <markphip_at_gmail.com>
Date: Thu, 22 Mar 2012 10:54:56 -0400

On Thu, Mar 22, 2012 at 6:05 AM, Julian Foad <julianfoad_at_btopenworld.com> wrote:
> By the way, my intent is to remove the '--symmetric' option and have the code just run inside the original 'sync' and
> 'reintegrate' code paths.  There's no reason, other than for testing, to expose this at the UI.

I assume the plan is that you would not need to specify --reintegrate
either? Is that how you would ultimately change the test suite ...
just remove all places where we add the --reintegrate option? I
imagine the merge command still has to accept the --reintegrate option
but we would mark it as deprecated in the help text or something?

Does the code still do any of the pre-merge verifications that
--reintegrate does? Or are those checks just not needed any more?

Mark Phippard
Received on 2012-03-22 15:55:28 CET

This is an archived mail posted to the Subversion Dev mailing list.