Merge error using Subversion 1.1 RC1

[Vincent Thornley <vt...@iee.org>]

I reported this 2 weeks ago but was able to give a reproduction recipe so
attached is the recipe (in the form of a windows batch file but without
extension to prevent virus scanner problems) and below I give the results.
(I am using SVN 1.1 RC1 on Win2k for server and client.)


>md h:\repos

>svnadmin create h:/repos

>svn co file:///h:/repos .
Checked out revision 0.

>md trunk

>md trunk\folder1

>echo some text  1>trunk/folder1/filea

>svn add trunk
A         trunk
A         trunk\folder1
A         trunk\folder1\filea

>svn ci . -m "Initial commit"
Adding         trunk
Adding         trunk\folder1
Adding         trunk\folder1\filea
Transmitting file data .
Committed revision 1.

>svn cp file:///h:/repos/trunk file:///h:/repos/branch -m Branched

Committed revision 2.

>svn up
A  branch
A  branch\folder1
A  branch\folder1\filea
Updated to revision 2.

>md branch\folder2

>echo some more text  1>>branch/folder1/filea

>echo another text file  1>branch/folder2/fileb

>svn add branch/folder2
A         branch\folder2
A         branch\folder2\fileb

>svn ci . -m "Modified branch"
Sending        branch\folder1\filea
Adding         branch\folder2
Adding         branch\folder2\fileb
Transmitting file data ..
Committed revision 3.

>svn merge -r 2:3 file:///h:/repos/branch trunk
U  trunk\folder1\filea
A  trunk\folder2
A  trunk\folder2\fileb

>svn revert trunk/folder2/fileb
Reverted 'trunk\folder2\fileb'

>del trunk\folder2\fileb

>svn ci . -m "Merged r2:3 of trunk into branch but not folder2/fileb"
Sending        trunk\folder1\filea
Adding         trunk\folder2
Transmitting file data .
Committed revision 4.

>svn log -v -r HEAD
------------------------------------------------------------------------
r4 | Vincent Thornley | 2004-09-14 09:24:50 +0100 (Tue, 14 Sep 2004) | 1
line
Changed paths:
   M /trunk/folder1/filea
   A /trunk/folder2 (from /branch/folder2:3)

Merged r2:3 of trunk into branch but not folder2/fileb
------------------------------------------------------------------------

>svn ls -R -r HEAD
branch/
branch/folder1/
branch/folder1/filea
branch/folder2/
branch/folder2/fileb
trunk/
trunk/folder1/
trunk/folder1/filea
trunk/folder2/
trunk/folder2/fileb


The problem occurs with the merge/revert/commit commands (lines 16 to 19 of
the script) and results in trunk/folder2/fileb being committed when it has
been reverted and deleted from the working copy. It is listed in the
repository yet does not appear in the log.

Vince