> > Oh yes, a lot has changed since 1.8 (which is EOL for a long time > already). Actually, the major improvement came client-side in version > 1.10, with the interactive tree conflict resolver [1]. This uses a > lot > of information from both working copy and repository to figure out > what the sensible options are in case of a tree conflict, and > attempts > to resolve some of those automatically. You should upgrade your > clients to _at least_ 1.10 to have a reasonable experience with tree > conflict situations. After 1.10 lots of bugfixes and improvements > have > been made to the tree conflict resolver, so I would recommend to go > for 1.14 (which is actually the only supported version ATM [2]).
Yeah I'm using RHEL8 which currently supports 1.10. I also compiled the latest version of 1.14 to see if it had any improvement. Unfortunately they all fail the same way in attempting to resolve file moves.
