You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Knauß,
Tobias <kn...@schmoll-maschinen.de> on 2018/09/30 16:06:08 UTC
possible bug in svn library at "searching tree conflict details"
(operation hangs forever)
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: knauss@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: info@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.
Re: possible bug in svn library at "searching tree conflict details"
(operation hangs forever)
Posted by Stefan Sperling <st...@elego.de>.
On Sun, Sep 30, 2018 at 04:06:08PM +0000, Knauß, Tobias wrote:
> 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.
Hi Tobias,
Thank you for your report.
There are two known bugs which cause this type of problem.
A patch for the first bug has been released in Subversion 1.10.2.
Does your version of TortoiseSVN include Subversion 1.10.2?
The second bug has no released fix yet, so this is the likely culprit.
This fix is in the pipeline for upcoming SVN 1.10.3 and also for upcoming
SVN 1.11.0. If TortoiseSVN could backport this fix to their pre-release
build version and you could test it, that would be appreciated.
https://svn.apache.org/r1839662
------------------------------------------------------------------------
r1839662 | stsp | 2018-08-30 13:39:40 +0200 (Thu, 30 Aug 2018) | 17 lines
Don't scan for moves for 'local missing' conflicts unless a YCA is known.
Prevent the resolver from embarking on an endless search in case of
a 'incoming edit vs. local missing' conflict where no YCA can be
found which would cap our search through history.
Reported by: Dag-Erling Smørgrav <de...@des.no>
https://svn.haxx.se/users/archive-2018-08/0038.shtml
* subversion/libsvn_client/conflicts.c
(find_deleted_rev): Account for a NULL moves-table.
(find_operative_moves, find_revision_for_suspected_deletion): Make search
for moves optional. The caller can now pass a NULL moves array to indicate
that moves should not be searched for.
(conflict_tree_get_details_local_missing): Only ask for move information if
a YCA was found.
------------------------------------------------------------------------
Thanks,
Stefan