How to avoid "fetching tree conflict details"?

[Thorsten Schöning]

Hi all,

I've recently updated to TortoiseSVN 1.10.0 and have some problems
during merges between trunk and tags in my projects.

My trunk is for development and contains e.g. Eclipse specific files,
test data and such. The tags are originally based on the trunk, but
development only files and directories have been removed. Within the
trunk those files are still there and change fomr time to time. So if
I merge from trunk to a tag I get a tree conflict because of missing
files and dirs within in the tag, whcih have been changed in the
trunk.

In the past this was no big deal, I simply marked the conflict as
resolved and the odl tree conflict dialog and things continued. with
the new version the tree conflict has changed and is fetching some
data from the server to only tell me after a minute or so that no
resultion could be found and to allow me to mark as resolved as well.

The problem is the waiting time, I know there's no solution to be
found and would prefer to mark instantly as resolved like in the
former version. I'm working over OpenVPN from my home office and
fetching all the data simply takes some time.

So, is there any way to get the old behaviour back? Thanks!

Mit freundlichen Grüßen,

Thorsten Schöning

--
Thorsten Schöning E-Mail: Thorsten....@AM-SoFT.de
AM-SoFT IT-Systeme http://www.AM-SoFT.de/

Telefon...........05151- 9468- 55
Fax...............05151- 9468- 88
Mobil..............0178-8 9468- 04

AM-SoFT GmbH IT-Systeme, Brandenburger Str. 7c, 31789 Hameln
AG Hannover HRB 207 694 - Geschäftsführer: Andreas Muchow

[Thorsten Schöning]

Guten Tag TortoiseSVN on behalf of tschoening,
am Montag, 30. April 2018 um 17:38 schrieben Sie:

> So, is there any way to get the old behaviour back? Thanks!

I feel stupid now, but it's at least possible to simply click "Abort"
in the dialog fetching the tree conflict details and afterwards I get
the correct dialog to "Postpone" or "Mark as resolved". This way I
don't need to wait.

Does this create any problems?

I initially thought this would abort the whole merge process and
therefore didn't try. Maybe add a textual message, that "Abort" is
fine if one doesn't want to wait and knows what one is doing?

[Thorsten Schöning]

Guten Tag TortoiseSVN on behalf of tschoening,
am Montag, 30. April 2018 um 17:38 schrieben Sie:

> So, is there any way to get the old behaviour back? Thanks!

Just as an additional note, this is how the result of fetching those
additional tree data looks at one project of mine:

https://picload.org/view/dorwcliw/clipboard01.png.html

It's pretty difficult to distinguish the individual buttons, recognize
all the paths etc.

[Tony Rietwyk]

Thank you - good to know it can be safely cancelled.  I got this as well for a recent merge, and with 10,000+ revisions it takes 5 minutes to come back.  And I still have no idea what files or folders it is looking for! 

[Thorsten Schöning]

Guten Tag Tony Rietwyk via TortoiseSVN,
am Dienstag, 1. Mai 2018 um 05:07 schrieben Sie:

> And I still have no idea what files or folders it is looking for! 

Looking at my merges yesterday, it seems to be looking at the history
of the moved files/dirs to suggest new move destinations and is
sometimes able to detect that dir A is now dir B in the merge target
and suggest to replace the dirs/files entirely or merge them or such.
Under some circumstances it was definitely able to resolve problems I
had to deal with manually before, because e.g. a tags structure uses
different tenants for configs of software for different customers and
such.

> /trunk/base.conf
> /tags/customer1/customer1.1.conf
> /tags/customer1/customer1.2.conf
> /tags/customer2/customer2.1.conf
> [...]

Merging between those kind of things seems to be handled better now
automatically. Looks interesting, but sometimes it simply can't find
any useful information and one needs to resolve manually anyway.

Mit freundlichen Grüßen,

Thorsten Schöning