Issue #12592 has been reported by Martin Drst.

----------------------------------------
Bug #12592: tree conflict produced by r55701
https://bugs.ruby-lang.org/issues/12592

* Author: Martin Drst
* Status: Open
* Priority: Normal
* Assignee: Nobuyoshi Nakada
* ruby -v: ruby 2.4.0dev (2016-07-17 trunk 55702) [x86_64-cygwin]
* Backport: 2.1: UNKNOWN, 2.2: UNKNOWN, 2.3: UNKNOWN
----------------------------------------
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!



-- 
https://bugs.ruby-lang.org/

Unsubscribe: <mailto:ruby-core-request / ruby-lang.org?subject=unsubscribe>
<http://lists.ruby-lang.org/cgi-bin/mailman/options/ruby-core>