Possible bug in conflict resolver

Hi all Not sure if this is a bug or expected behaviour. Using Subversion 1.11.1 Two people with separate checkouts working on the same file. Person A edits a line and the renames the file and commits. Person B edits the same line in the same file and then does an update. The conflict resolver fi

New lines in notify.c

Hi all Just out of curiosity in notify.c we have the two lines SVN_ERR(svn_cmdline_printf(pool, "\rChecking r ")); SVN_ERR(svn_cmdline_printf(pool, "\rChecking r%ld...", n->revision)); Is there a specific reason \r is used and not \n? Thanks Jonathan Guy

Re: [PATCH] Suppress conflict resolver in dry-run merge

other reasons I don’t know of to run the resolver so we’ll just leave it as is. Thanks again for your time. Regards Jonathan > On 31 Oct 2018, at 12:35, Stefan Sperling wrote: > > On Wed, Oct 31, 2018 at 09:46:23AM +0000, Jonathan Guy wrote: >> Hi Stephan >> Thanks for th

Re: [PATCH] Suppress conflict resolver in dry-run merge

08:32, Stefan Sperling wrote: > > On Tue, Oct 30, 2018 at 06:39:49PM +, Jonathan Guy wrote: >> [[[ >> *subversion/svn/merge-cmd.c >> (svn_cl__merge): Suppress the interactive conflict resolver >> if a merge has been performed with the dry-run option. >> ]]] &

[PATCH] Suppress conflict resolver in dry-run merge

[[[ *subversion/svn/merge-cmd.c (svn_cl__merge): Suppress the interactive conflict resolver if a merge has been performed with the dry-run option. ]]] merge-cmd.c.patch Description: Binary data