Hello, First, as suggested on the mailing list page, I should mention that I am not subscribed to the mailing list, so please add me in CC on the responses. I also don't know if the mailing list accepts HTML, so I chose plain-text, but this does not allow adding screenshots, so for convenience you may simply look at the conversation at the TortoiseSVN google group, where I first posted about the possible bug in your svn library: https://groups.google.com/forum/#!topic/tortoisesvn/qUoGtI8hxJ8
I have added the first and last message here: ------------------------------------------------------------------- Message #01, Tobias Knauss, 2018-09-07: I created a branch at revision 2000 of the trunk. I renamed some files in the trunk at revision 2141. I edited these files in the branch at revision 2194. Now I want to merge the changes from the branch back to the trunk, but it causes a tree conflict because files have been renamed there. This is okay. Not okay is, that a window pops up and tells me "fetching tree conflict information" and searches back until revision 1359 and hangs there forever. In r1359 we had many edits (files and folders renamed, files deleted) because we converted our code from C++/CLI (.cpp, .h) to C# (.cs). Somehow this fetching dialog doesn't like that, even though the conflicting files were not part of the commit for r1359. <screenshot of TortoiseSVN dialog window "Edit Tree Conflicts", saying "Fetching tree conflict information..." and stuck at "checking r1359"> Why does it hang? Why does it search back so far? It's not needed. ------------------------------------------------------------------- Message #07, Stefan Küng, 2018-09-07: Seems the problem is inside the svn library. You should report it on the svn mailing list: http://subversion.apache.org/mailing-lists.html ------------------------------------------------------------------- Mit freundlichen Grüßen / Best regards Tobias Knauß Schmoll Maschinen GmbH Odenwaldstraße 67 63322 Rödermark Deutschland Phone: +49 6074 8901-663 Fax: +49 6074 8901-58 E-Mail: kna...@schmoll-maschinen.de Web: www.schmoll-maschinen.de Next Shows with Schmoll Maschinen GmbH: TPCA Show, Taipei, 24. - 26. October 2018 HKPCA Show, Shenzhen 5. - 5. December 2018 Schmoll Maschinen GmbH, Odenwaldstraße 67, 63322 Rödermark, Germany Phone +49 (0) 6074.8901-0 * Fax : +49 (0)6074.8901-58 * Mail: i...@schmoll-maschinen.de Handelsregister / Commercial Register: Amtsgericht Offenbach, HRB 33187 Geschaeftsführer / Managing Director: Stephan Kunz Diese E-Mail kann vertrauliche und/oder rechtlich geschuetzte Informationen enthalten. Wenn Sie nicht der richtige Adressat sind oder diese E-Mail irrtuemlich erhalten haben, informieren Sie bitte sofort den Absender und vernichten Sie diese Mail. Das unerlaubte Kopieren sowie die unbefugte Weitergabe dieser Mail ist nicht gestattet. This e-mail may contain confidential and/or privileged information. If you are not the intended recipient (or have received this e-mail in error) please notify the sender immediately and destroy this e-mail. Any unauthorized copying, disclosure or distribution of the material in this e-mail is strictly forbidden.
