1.9.4 -> 1.14.9 : Merge Continue

34 views
Skip to first unread message

free yang

unread,
Dec 10, 2025, 11:20:53 AM12/10/25
to TortoiseSVN
It seems like the process has changed from version 1.9.4.
After clicking Merge Resolved, the process does not automatically proceed to the next step. Instead, users must click the Merge Continue button, and at that point the merge process starts again from the beginning.
I noticed a similar question was raised below as well—would it be possible to improve this behavior?
Because of this issue, merges that previously took about 30 minutes are now taking up to around two hours, which is causing significant difficulty for the team.
We would greatly appreciate it if you could consider an improvement.

Stefan

unread,
Dec 30, 2025, 2:29:34 AM (9 days ago) 12/30/25
to TortoiseSVN
you also have to update the server to a recent version, with older server versions the svn clients can not use new APIs to fetch the required data but have to fetch that data in multiple, time consuming steps.

free yang

unread,
Dec 30, 2025, 2:47:18 AM (9 days ago) 12/30/25
to TortoiseSVN
We are using the paid version of VisualSVN 4.2.1. Should we upgrade to a newer version?

2025년 12월 30일 화요일 PM 4시 29분 34초 UTC+9에 Stefan님이 작성:

Stefan

unread,
Dec 30, 2025, 4:10:43 AM (9 days ago) 12/30/25
to TortoiseSVN
On Tuesday, December 30, 2025 at 8:47:18 AM UTC+1 free yang wrote:
We are using the paid version of VisualSVN 4.2.1. Should we upgrade to a newer version?

Yes!
VisualSVN 4.2.1 uses svn 1.10. The latest VisualSVN server uses svn 1.14.5.

free yang

unread,
Dec 30, 2025, 5:26:15 AM (9 days ago) 12/30/25
to TortoiseSVN
Thanks for the reply. I'll have to consider upgrading.

2025년 12월 30일 화요일 PM 6시 10분 43초 UTC+9에 Stefan님이 작성:

free yang

unread,
Jan 6, 2026, 12:50:32 AM (yesterday) Jan 6
to TortoiseSVN
I tried testing with visual svn 5.4.5, but the same problem occurred.

merge.jpg


After resolving the merge, if you click resolve conflicts, the merge check will be performed again from the beginning.
2025년 12월 30일 화요일 PM 7시 26분 15초 UTC+9에 free yang님이 작성:

free yang

unread,
Jan 6, 2026, 12:54:24 AM (yesterday) Jan 6
to TortoiseSVN
During testing, there were about three merge conflicts, and although I fixed them, the merge process started over again in the order 558197->558209->558369-> This makes it take longer to merge SVN 1.14 (the current version) than SVN 1.9.7 when doing large-scale merges. Is there a way to fix this?

2026년 1월 6일 (화) PM 2:50, free yang 제공업체: TortoiseSVN <torto...@googlegroups.com>님이 작성:
--
You received this message because you are subscribed to a topic in the Google Groups "TortoiseSVN" group.
To unsubscribe from this topic, visit https://groups.google.com/d/topic/tortoisesvn/A_cfPS9nfGE/unsubscribe.
To unsubscribe from this group and all its topics, send an email to tortoisesvn...@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/tortoisesvn/0973a2cc-822a-49d0-ba4e-a417a93d11efn%40googlegroups.com.
Reply all
Reply to author
Forward
0 new messages