New - Replacing a dir and one of its children during merge fails in commit

http://subversion.tigris.org/issues/show_bug.cgi?id=2690

                 Issue #|2690
                 Summary|Replacing a dir and one of its
children during merge f
                        |ails in commit
               Component|subversion
                 Version|1.4.x
                Platform|PC
                     URL|
              OS/Version|All
                  Status|NEW
       Status whiteboard|
                Keywords|
              Resolution|
              Issue type|DEFECT
                Priority|P3
            Subcomponent|libsvn_wc
             Assigned to|issuessubversion
             Reported by|lgo






------- Additional comments from lgotigris.org Thu Jan  4
14:53:56 -0800 2007 -------
Say you have a repo like this:
/C/foo
/C/foo/test.txt
/F

Step 1: merge /C/foo to /F + commit
Step 2: delete /C/foo + commit
Step 3: create a new /C/foo and /C/foo/test.txt + commit
Step 4: merge /C/foo to /F

In the working copy, the status of F will be:
R  + foo
R  + foo/test.txt

Committing this working copy will fail with error (example
path/revs):
......subversionlibsvn_clientcommit.c:867:
(apr_err=160028)
svn: Commit failed (details follow):
......subversionlibsvn_reposcommit.c:127:
(apr_err=160028)
svn: Out of date: '/A/C/foo/new file 2' in transaction '5-1'

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org

http://subversion.tigris.org/issues/show_bug.cgi?id=2690







------- Additional comments from lgotigris.org Thu Jan  4
15:03:37 -0800 2007 -------
r22910 adds test merge_dir_and_file_replace that covers this
issue.

------------------------------------------------------------
---------
To unsubscribe, e-mail: issues-unsubscribesubversion.tigris.org
For additional commands, e-mail: issues-helpsubversion.tigris.org