Re: Enabling symmetric merge, and UI details

2012-08-21 Thread Julian Foad
Neels J Hofmeyr wrote: > On 2012-08-03 21:25, Julian Foad wrote: >> It's time to lose the temporary '--symmetric' option and make >> it the default mode in 'svn'. > > sounds fantastic :) > >> . > > A good read, but I c

Re: Enabling symmetric merge, and UI details

2012-08-21 Thread Neels J Hofmeyr
On 2012-08-03 21:25, Julian Foad wrote: > It's time to lose the temporary '--symmetric' option and make it the default > mode in 'svn'. sounds fantastic :) > . A good read, but I can't find that "[5]" reference: "...we n

Re: Enabling symmetric merge, and UI details

2012-08-10 Thread Julian Foad
I (Julian Foad) wrote on 6 August 2012: > OK, enabled in 1369896. > > --reintegrate forces a 1.7 reintegrate, unconditionally, at the moment; I > haven't put a deprecation warning in there. > > Please let me know if anyone sees unexpected results from merge now. > > TODO: > > * Revise 'svn mer

Re: Enabling symmetric merge, and UI details

2012-08-06 Thread Branko Čibej
On 06.08.2012 20:23, Stefan Sperling wrote: > On Mon, Aug 06, 2012 at 07:09:11PM +0100, Julian Foad wrote: >> --reintegrate forces a 1.7 reintegrate, unconditionally, at the moment; I >> haven't put a deprecation warning in there. > In my opinion it would be best to try to keep --reintegrate and i

Re: Enabling symmetric merge, and UI details

2012-08-06 Thread Stefan Sperling
On Mon, Aug 06, 2012 at 07:09:11PM +0100, Julian Foad wrote: > OK, enabled in 1369896. This is awesome progress. No time to try it right now but I will definitely try this. Thanks! > --reintegrate forces a 1.7 reintegrate, unconditionally, at the moment; I > haven't put a deprecation warning in

Re: Enabling symmetric merge, and UI details

2012-08-06 Thread Julian Foad
merge and deleted subtrees". - Julian - Original Message - > From: Julian Foad > To: Branko Čibej > Cc: "dev@subversion.apache.org" > Sent: Monday, 6 August 2012, 10:23 > Subject: Re: Enabling symmetric merge, and UI details > > Branko Čibej wrote on

Re: Enabling symmetric merge, and UI details

2012-08-06 Thread Julian Foad
Branko Čibej wrote on 3 August 2012: > On 03.08.2012 21:51, Mark Phippard wrote: >> On Fri, Aug 3, 2012 at 3:25 PM, Julian Foad wrote: >>>   * Make the '--reintegrate' option mean the user believes >>> a reintegrate-style merge is needed, so check that the >>>     previous merge is as expec

Re: Enabling symmetric merge, and UI details

2012-08-03 Thread Julian Foad
Mark Phippard wrote: > On Fri, Aug 3, 2012 at 4:54 PM, Julian Foad wrote: >> Today, if the user gives the --reintegrate option when a >> non-reintegrate merge is the appropriate one based on past >> merges, Subversion goes through the motions of a reintegrate >> merge and produces the wrong resu

Re: Enabling symmetric merge, and UI details

2012-08-03 Thread Mark Phippard
On Fri, Aug 3, 2012 at 4:54 PM, Julian Foad wrote: >> It does not seem like it would be necessary. What >> happens today if the user does this? I guess if --reintegrate does >> the wrong thing today then this makes sense. But if it basically >> still gives a valid result why bother to make a

Re: Enabling symmetric merge, and UI details

2012-08-03 Thread Julian Foad
Mark Phippard wrote: > On Fri, Aug 3, 2012 at 3:25 PM, Julian Foad wrote: >>  It's time to lose the temporary '--symmetric' option and make >> it the default mode in 'svn'. > > Sounds good.  Just a couple of questions. > >>    * Make the '--reintegrate' option mean the user believes a >>     rei

Re: Enabling symmetric merge, and UI details

2012-08-03 Thread Branko Čibej
On 03.08.2012 21:51, Mark Phippard wrote: > On Fri, Aug 3, 2012 at 3:25 PM, Julian Foad > wrote: > >> It's time to lose the temporary '--symmetric' option and make it the default >> mode in 'svn'. > Sounds good. Just a couple of questions. > >> * Make the '--reintegrate' option mean the user

Re: Enabling symmetric merge, and UI details

2012-08-03 Thread Mark Phippard
On Fri, Aug 3, 2012 at 3:25 PM, Julian Foad wrote: > It's time to lose the temporary '--symmetric' option and make it the default > mode in 'svn'. Sounds good. Just a couple of questions. > * Make the '--reintegrate' option mean the user believes a > reintegrate-style merge is needed, so c

Enabling symmetric merge, and UI details

2012-08-03 Thread Julian Foad
Hi, merge fans. It's time to lose the temporary '--symmetric' option and make it the default mode in 'svn'. Some people have been kind enough to try using the 'symmetric' mode and report back, mainly Paul to whom I am most grateful.  I am aware of two current issues ([1],[2]) which I am inves