Critical Description
Hi, We detected a subversion merge problem: What we did: 1) We created a branch (at revision 616) 2) Sometime after on trunk some subversion properties were set (eol-style=native set on all text files ...) as well as all files were reformatted and checked into trunk. 3) We worked on our branch 4) We deleted some files 5) When merging trunk to our branch we got the following error message "foo.java" is not under version control. This file was deleted in our branch, but exists in main latest. Merge of the project (runtime base) form revision 616 to head revision was not possible (we tried the option --force, but it did not help). The workaround: 1) Some time ago (24.3.2005) some subversion properties were set (eol-style=native set on all text files ...). Via the show log we found that this happened in revision 875 (for our runtime base project). 2) We merged now in two steps, from 616 to 874 and from 876 to head (thanks to Florian for this idea :-) 3) Now we are happy again :-) This leads us to believe that there is a subversion bug when merging files that had their properties modified to a branch where these files have been deleted. Further info: svn, version 1.1.3 (r12730) compiled Jan 20 2005, 05:51:34 Client on WindowsXP, Server on Linux with file based repository Recipe to reproduce: cd trunk\dir mkdir svn vi svn\foo.java (add some text) svn add svn svn commit svn -m "test branching" svn copy http://server:8080/svn/trunk/dir/svn http://server:8080/svn/branches/svn_bug Committed revision 1581. cd trunk\dir\svn svn propset svn:eol-style CRLF foo.java svn commit foo.java -m "test set properties" cd branches\svn_bug svn rm foo.java svn commit . -m "test delete" branches\svn_bug>svn merge -r 1581:HEAD http://server:8080/svn/trunk/dir/svn svn: Use --force to override this restriction svn: 'foo.java' is not under version control branches\svn_bug>svn merge --force -r 1581:HEAD http://server:8080/svn/trunk/dir/svn svn: Use --force to override this restriction svn: 'foo.java' is not under version control best regards, Florian
Original issue reported by fpnfpn
Attachments
Issue Links
- duplicates
-
SVN-2132 [PATCH] Fix error merging propchanges into a deleted file
-
- Closed
-