Hi,
this seems to be the same issue that I reported back here
(https://mail-archives.apache.org/mod_mbox/subversion-users/201804.mbox/browser).
The bug fix that Stefan Sperling did for 1.10.2 has helped in some of my
merges by breaking off earlier, but it is still equally slow at checking each
On Wed, Aug 29, 2018 at 12:54:43PM +0200, Dag-Erling Smørgrav wrote:
> I'm using Subversion 1.10.2 to perform a non-interactive merge with
> around 15 tree conflicts (files that exist on the source branch but have
> been deleted from the target branch). It spends exactly two hours on
> each confli
On Wed, Aug 29, 2018 at 02:29:16PM +0200, Branko Čibej wrote:
> On 29.08.2018 12:54, Dag-Erling Smørgrav wrote:
> > Please add an option to disable conflict resolution entirely.
>
> Would not one of the --accept option values work? E.g.,
> `--accept=theirs-conflict', though that would also affect
On 29.08.2018 12:54, Dag-Erling Smørgrav wrote:
> I'm using Subversion 1.10.2 to perform a non-interactive merge with
> around 15 tree conflicts (files that exist on the source branch but have
> been deleted from the target branch). It spends exactly two hours on
> each conflict before the connect
Daniel Shahaf writes:
> Dag-Erling Smørgrav writes:
> > Please add an option to disable conflict resolution entirely.
> As a hotfix, I think this will do what you need?
Thanks, I will test this later.
DES
--
Dag-Erling Smørgrav - d...@des.no
Dag-Erling Smørgrav wrote on Wed, Aug 29, 2018 at 12:54:43 +0200:
> Please add an option to disable conflict resolution entirely.
As a hotfix, I think this will do what you need?
Index: subversion/libsvn_client/conflicts.c
===
--- su
I'm using Subversion 1.10.2 to perform a non-interactive merge with
around 15 tree conflicts (files that exist on the source branch but have
been deleted from the target branch). It spends exactly two hours on
each conflict before the connection is killed and it gives up and moves
on to the next.
