Am Freitag, 7. September 2018 15:58:59 UTC+2 schrieb Stefan: > > if the crash happens repeatedly, can you try doing the merge with the > command line client please? > I can't see anything that could crash in the TSVN code of that part. > The crash happens shortly after a "fetching tree conflict information" popped up. It is reproducible on the merge which I am currently trying to do. The text log has no useful info (server name removed): [14696] #1 Thread:14404 SVN::GetWCRootFromPath(line 2071) svn_client_get_wc_root Path=D:/sw_development/swcore [14696] #1 Thread:14404 done (2035 µs) [14696] #2 Thread:14404 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=D:/sw_development/swcore [14696] #2 Thread:14404 done (129 µs) [14696] #3 Thread:13904 SVN::GetWCRevisionStatus(line 2431) svn_wc_revision_status2 Path=D:/sw_development/swcore [14696] #3 Thread:13904 done (50298 µs) [14696] #4 Thread:14404 SVNReadProperties::Refresh(line 150) svn_client_proplist4 Path=D:/sw_development/swcore [14696] #4 Thread:14404 done (4923 µs) [14696] #5 Thread:11552 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #5 Thread:11552 done (406789 µs) [14696] #6 Thread:11552 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #6 Thread:11552 done (201771 µs) [14696] #7 Thread:11552 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #7 Thread:11552 done (167820 µs) [14696] #8 Thread:11552 SVN::GetHEADRevision(line 2253) svn_client_open_ra_session2 Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #8 Thread:11552 done (183206 µs) [14696] #9 Thread:11552 SVN::GetHEADRevision(line 2261) svn_ra_get_latest_revnum Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #9 Thread:11552 done (77341 µs) [14696] #10 Thread:11552 CLogDlg::LogThread(line 1681) svn_client_mergeinfo_get_merged Path=D:/sw_development/swcore [14696] #10 Thread:11552 done (211669 µs) [14696] #11 Thread:11552 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=http://<servername>/svn/di_swcore/trunk [14696] #11 Thread:11552 done (206523 µs) [14696] #12 Thread:11552 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=http://<servername>/svn/di_swcore/trunk [14696] #12 Thread:11552 done (197219 µs) [14696] #13 Thread:11552 SVN::GetHEADRevision(line 2253) svn_client_open_ra_session2 Path=http://<servername>/svn/di_swcore/trunk [14696] #13 Thread:11552 done (198691 µs) [14696] #14 Thread:11552 SVN::GetHEADRevision(line 2261) svn_ra_get_latest_revnum Path=http://<servername>/svn/di_swcore/trunk [14696] #14 Thread:11552 done (76541 µs) [14696] #15 Thread:11552 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=http://<servername>/svn/di_swcore/trunk [14696] #15 Thread:11552 done (198020 µs) [14696] #16 Thread:11552 CSVNLogQuery::Log(line 412) svn_client_log5 [14696] #16 Thread:11552 done (961534 µs) [14696] #17 Thread:11552 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #17 Thread:11552 done (203087 µs) [14696] #18 Thread:11552 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #18 Thread:11552 done (197997 µs) [14696] #19 Thread:11552 SVN::GetHEADRevision(line 2253) svn_client_open_ra_session2 Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #19 Thread:11552 done (203700 µs) [14696] #20 Thread:11552 SVN::GetHEADRevision(line 2261) svn_ra_get_latest_revnum Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #20 Thread:11552 done (78212 µs) [14696] #21 Thread:11552 CSVNLogQuery::Log(line 412) svn_client_log5 [14696] #21 Thread:11552 done (292498 µs) [14696] #22 Thread:12084 SVNReadProperties::Refresh(line 150) svn_client_proplist4 Path=D:/sw_development/swcore [14696] #22 Thread:12084 done (3157 µs) [14696] #23 Thread:12084 SVN::PegMerge(line 1142) svn_client_merge_peg5 Path=http://<servername>/svn/di_swcore/branches/IO-System [14696] #23 Thread:12084 done (3792044 µs) [14696] #24 Thread:12084 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=D:/sw_development/swcore [14696] #24 Thread:12084 done (131 µs) [14696] #25 Thread:12084 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=D:/sw_development/swcore [14696] #25 Thread:12084 done (85 µs) [14696] #26 Thread:12084 SVN::GetRepositoryRootAndUUID(line 2180) svn_client_get_repos_root Path=D:/sw_development/swcore [14696] #26 Thread:12084 done (86 µs) [14696] #27 Thread:12084 SVNConflictInfo::Get(line 122) svn_client_conflict_get Path=D:/sw_development/swcore/basics_test/CArray_Tests.cs [14696] #27 Thread:12084 done (2258 µs) [14696] #28 Thread:12084 SVNConflictInfo::Get(line 146) svn_client_conflict_get_conflicted Path=D:/sw_development/swcore/basics_test/CArray_Tests.cs [14696] #28 Thread:12084 done (44 µs) [14696] #29 Thread:12084 SVNConflictInfo::Get(line 159) svn_client_conflict_tree_get_description Path=D:/sw_development/swcore/basics_test/CArray_Tests.cs [14696] #29 Thread:12084 done (91 µs) [14696] #30 Thread:12084 SVNConflictInfo::FetchTreeDetails(line 548) svn_client_conflict_tree_get_details Path=D:/sw_development/swcore/basics_test/CArray_Tests.cs [14696] #30 Thread:12084 done (2019056 µs) [14696] #31 Thread:12084 SVNConflictInfo::FetchTreeDetails(line 560) svn_client_conflict_tree_get_description Path=D:/sw_development/swcore/basics_test/CArray_Tests.cs [14696] #31 Thread:12084 done (291 µs) [14696] #32 Thread:12084 SVNConflictInfo::GetTreeResolutionOptions(line 409) svn_client_conflict_tree_get_resolution_options Path=D:/sw_development/swcore/basics_test/CArray_Tests.cs
Tested with svn.exe, seems to produce the same output as TSVN: and it hangs... I will do a manual resolve now. -- You received this message because you are subscribed to the Google Groups "TortoiseSVN" group. To unsubscribe from this group and stop receiving emails from it, send an email to [email protected]. To view this discussion on the web visit https://groups.google.com/d/msgid/tortoisesvn/57676bab-9441-418f-81b7-a9b9c2769334%40googlegroups.com. For more options, visit https://groups.google.com/d/optout.
