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

Possible bug: "Searching tree conflict details" takes forever

From: Jacob Weber <jacob.weber_at_scivantage.com>
Date: Tue, 4 Aug 2020 18:37:07 +0000

Hi there. I'm doing a merge which seems to be doing a very long-running operation (over an hour so far) when it gets to the "Searching tree conflict details" step. I'm wondering if there's any way to avoid this.

I'm merging from a branch X where a directory was removed, into a branch Y where that same directory was removed. In each case, the removal was actually done as part of a reintegrate merge from a different branch.

I can reproduce this every time I revert and restart the merge. Unfortunately I can't share the content of my repository.

The output is something like this:

$ cd branchY
$ svn update
$ svn merge ^/branchX
--- Recording mergeinfo for merge of r10000 through r20000 into '.':
 U .
--- Merging r20001 through r20100 into '.':
A foo
A bar
 G .
--- Recording mergeinfo for merge of r20001 through r20100 into '.':
 G .
Summary of conflicts:
  Text conflicts: 2
  Tree conflicts: 7
Searching tree conflict details for 'path/to/conflict/dir' in repository:
Checking r9000...

At this point it slowly starts decreasing the revision after "Checking". But it seems to be going through my entire repository history, which will take forever.

Is there any way to avoid this?

Mac OS 10.14.6
SVN client 1.14.0, compiled Jul 4 2020, 20:57:11 on x86_64-apple-darwin18.7.0
SVN server 1.8.13
Received on 2020-08-04 20:39:09 CEST

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