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: Symmetric merge and deleted subtrees

2012-08-06 Thread Julian Foad
Hi Paul. I have only had a chance to skim through your reply so far.  I'm glad that you find it to be an explicable and harmless difference. I have assigned Issue #4217 to track this, as I want to be able to refer to it before having a chance to study your reply properly. - Julian Paul Burb

Re: Enabling symmetric merge, and UI details

2012-08-06 Thread Julian Foad
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 merge' help text. * Checks for 'no local mods' and 'no switche

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: svn delete fails with "403 Forbidden" if root is not readable

2012-08-06 Thread Dmitry Pavlenko
Hello, I'd like to ping my old report. I'll recollect: if there's no read permission of the repository root, "svn delete" for sub-URL always fails. I had the same issue in SVNKit but fixed, and here's the fix: svn log --diff -r9286 http://svn.svnkit.com/repos/svnkit/trunk/ I also tried to ap

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