possible client bug with 1.10 automatic conflict resolver
From: Blaine Whittle <BWhittle_at_blizzard.com>
Date: Fri, 11 Aug 2017 21:26:14 +0000
I'm seeing different behavior with automatic conflict resolver when operating against a 1.10.0-alpha3 compared to a 1.7.10 server. I'm using a 1.10.0-alpha3 client.
* Create branch B from branch A.
When testing against both servers, the client was correctly identified that the file was moved and the revision(s) of the move / rename. However, when testing against the 1.7.10 server the client did not automatically resolve the tree conflict and emitted the text "Subversion is not smart enough to resolve this tree conflict automatically!"
The exact output from a 1.7.10 server was
Subversion is not smart enough to resolve this tree conflict automatically!
Select: (p) Postpone, (r) Mark as resolved, (h) Help, (q) Quit resolution:
Whereas the 1.10.0 server produced
The 1.10.0 server test shows two file renames whereas the 1.7.10 only had one. This is correct and expected behavior in both cases.
The same client machine was used in both tests. It's possible I'm doing something wrong and the issue isn't related to the server version. However I've rerun slightly different versions of this test and got the same results.
This is an archived mail posted to the Subversion Users mailing list.