[SVN-3989] merge which deletes file with native eol-style raises spurious tree conflict

• Type: Bug
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.7.x
• Fix Version/s: 1.7.0
• Component/s: libsvn_client
• Assignee: Unassigned
• Reporter: Paul Burba
• Created: 16/Aug/11 18:06
• Updated: 27/Oct/18 16:29
• Resolved: 18/Aug/11 18:48

Description

Found this regression from 1.6 this morning while syncing a feature branch: A
merge which deletes an unmodified file results in a spurious tree conflict if
the file needs eol translation.

C:\SVN\src-trunk-4>svn up
Updating '.':
At revision 1158319.

C:\SVN\src-trunk-4>svn info
Path: .
Working Copy Root Path: C:\SVN\src-trunk-4
URL: https://svn.apache.org/repos/asf/subversion/branches/issue-3975
Repository Root: https://svn.apache.org/repos/asf
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 1158319
Node Kind: directory
Schedule: normal
Last Changed Author: pburba
Last Changed Rev: 1158318
Last Changed Date: 2011-08-16 11:12:14 -0400 (Tue, 16 Aug 2011)

C:\SVN\src-trunk-4>svn pl -v
subversion\bindings\javahl\src\org\tigris\subversion\javahl\JNIError.java
Properties on
'subversion\bindings\javahl\src\org\tigris\subversion\javahl\JNIError.java':
  svn:eol-style
    native

C:\SVN\src-trunk-4>svn merge ^^/subversion/trunk -c1157416
--- Merging r1157416 into '.':
U    subversion\bindings\javahl\tests\org\apache\subversion\javahl\BasicTests.java
A    subversion\bindings\javahl\src\org\apache\subversion\javahl\JNIError.java
   C subversion\bindings\javahl\src\org\tigris\subversion\javahl\JNIError.java
--- Recording mergeinfo for merge of r1157416 into '.':
 U   .
Summary of conflicts:
  Tree conflicts: 1

C:\SVN\src-trunk-4>svn st
 M      .
M      
subversion\bindings\javahl\tests\org\apache\subversion\javahl\BasicTests.java
      C subversion\bindings\javahl\src\org\tigris\subversion\javahl\JNIError.java
      >   local edit, incoming delete upon merge
A  +    subversion\bindings\javahl\src\org\apache\subversion\javahl\JNIError.java
Summary of conflicts:
  Tree conflicts: 1

C:\SVN\src-trunk-4>svn diff --summarize ^^/subversion/trunk -c1157416
M      
https://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
A      
https://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
D      
https://svn.apache.org/repos/asf/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java

C:\SVN\src-trunk-4>svn log ^^/subversion/trunk -v -r1157416
------------------------------------------------------------------------
r1157416 | markphip | 2011-08-13 16:03:25 -0400 (Sat, 13 Aug 2011) | 13 lines
Changed paths:
   A
/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/JNIError.java
(from /subversion/trunk/subversion/bindings/javahl/src/org/tigr
is/subversion/javahl/JNIError.java:1157410)
   D
/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/JNIError.java
   M
/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java

Move JNIError class from org.tigris to org.apache package. This
resolves NoClassDefFoundException at runtime when native code tries
to throw this error.

[ subversion/bindings/javahl/ ]
* tests/org/apache/subversion/javahl/BasicTests.java
  (testJNIError): New test to verify this error is thrown.

* src/org/tigris/subversion/javahl/JNIError.java
* src/org/apache/subversion/javahl/JNIError.java
  Moved class from tigris to apache package.


------------------------------------------------------------------------