Reproduction recipe for "Target path does not exist"

Hi merge fans,

the following simple scenario and reproduction recipe leads to an unexpected
"Target path does not exist" when merging changes from trunk to a branch

What I did:
1. Develop on trunk
2. Restore a previous state of trunk by deleting trunk and copying a
previous state as the new trunk
3. Branch (resurrected) trunk
4. Develop on (resurrected) trunk
5. Merge changes from (resurrected) trunk to branch

The critical point is 2. The rest is standard.

What happened:
The error can be reproduced with 1.5.4 on linux and 1.6.0-dev with a self-
compiled svn.exe from trunk (Revision 34217).

Attached are a shell script for linux and a batch file for windows. Both
trigger the same error:

C:\Development\SVN\TortoiseSVN\ext\subversion\subversion\libsvn_repos\
reporter.c:1162 (apr_err=160005)
svn: Target path does not exist

Attached is also the output of the batch file and a revision graph. These are
the logs to make it easier to read the revision graph:
Revision 1: created initial structure
Revision 2: some empty file
Revision 3: malicious change
Revision 4: remove trunk
Revision 5: resurrected trunk_at_2
Revision 6: created 1.0 branch
Revision 7: more trunk changes

What I expected:
In my opinion the merge from trunk to branch should work in this case by
merging revision 7. Can this be confirmed as a bug?

If the malicious change on trunk had been reverted by a simple reverse
merge, everything would be fine. On the other hand, deleting trunk and
resurrecting it should not trigger this error.

Tobias

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org

• text/plain attachment: output.txt

• application/x-shellscript attachment: target_path_bug.sh

• text/plain attachment: target_path_bug.bat