Major Description
(This problem may be related to bug #1093, but I don't think they're exactly the same issue.) I'm unable to use the 'merge' command on a file that has been renamed. Here's the recent revision history for this file (same as in bug #1093): ------------------------------------------------------------------------ rev 20172: akuchlin | 2003-01-15 09:13:35 -0500 (Wed, 15 Jan 2003) | 1 line Add some real changes for the next version ------------------------------------------------------------------------ rev 20164: gward | 2003-01-15 08:15:11 -0500 (Wed, 15 Jan 2003) | 1 line Rename CHANGES to CHANGES.txt. ------------------------------------------------------------------------ rev 20163: gward | 2003-01-15 08:11:13 -0500 (Wed, 15 Jan 2003) | 1 line Add some stuff to the last release. ------------------------------------------------------------------------ I want to use the 'merge' command to undo rev 20163 -- ie. a change that was made to the file CHANGES should be undone to the file CHANGES.txt. Here's what I've tried and how it has failed: $ svn merge -r19589:20163 CHANGES svn: Entry has no url svn: 'CHANGES' has no URL $ svn merge -r19589:20163 CHANGES.txt svn: RA layer request failed svn: REPORT request failed on /repos/trunk/vfab/CHANGES.txt svn: The REPORT request returned invalid XML in the response: XML parse error at line 1: not well-formed (invalid token). (/repos/trunk/vfab/CHANGES.txt) (I gather this problem is the same as bug #940.) $ svn merge -r19589:20163 http://localhost:8080/repos/trunk/vfab/CHANGES svn: Error string not specified yet svn: REPORT request failed on /repos/trunk/vfab/CHANGES svn: The REPORT status was 404, but expected 200. $ svn merge -r19589:20163 http://localhost:8080/repos/trunk/vfab/CHANGES.txt svn: RA layer request failed svn: REPORT request failed on /repos/trunk/vfab/CHANGES.txt svn: The REPORT request returned invalid XML in the response: XML parse error at line 1: not well-formed (invalid token). (/repos/trunk/vfab/CHANGES.txt) So what's the deal here? Is it even possible to use 'merge' across a file rename?
Original issue reported by gward