Bug #12592: tree conflict produced by r55701

• Status: Rejected
• Assignee: nobu (Nobuyoshi Nakada)
• Target version: -
• ruby -v: ruby 2.4.0dev (2016-07-17 trunk 55702) [x86_64-cygwin]
• Backport: 2.1: UNKNOWN, 2.2: UNKNOWN, 2.3: UNKNOWN

[duerst (Martin Dürst)]

Revision r55701 produced a tree conflict. The reason is most probably that the directory
enc/unicode/data/8.0.0 was already present, but was again added on top of that by r55701.

After trying to resolve the conflict, the two files in that directory that come from SVN (casefold.h and name2ctype.h) are now show as 'deleted', which is very strange.

Any kind of advice on the kind of SVN magic needed to fix this problem is highly appreciated!

[duerst (Martin Dürst)]

• Status changed from Open to Rejected

It turns out that Tortoise SVN may not be able to handle this kind of thing, but it can be done on the command line. Anyway, changing the directory structure in a way that can lead to tree conflicts should be done very carefully. I still don't see the benefits of r55701 itself.