Merge problem

I am using svn version 1.3.0 (r17949) here and I have the following
phenomenon, that I don't understand. Is it a bug or a feature:

1) Made a branch of an existing tree(trunk) with svn copy
2) in trunk: deleted file TestFile and committed
3) in trunk: created link with the same name, added and committed
4) tried to merge both modifications into branch with a single merge
    command, succeded with

    D TestFile
    A TestFile

    as output.

5) Then I tried to commit these changes and got the following
    error message:

    Replacing TestFile
    svn: Commit failed (details follow):
    svn: Veraltet: '/tmp/test/TestFile' in Transaktion '792-1'

    Sorry, that the last message is german, but setting the LANG variable
    to en_GB didn't help, maybe this translation helps:
    (svn: Too old: '/tmp/test/TestFile' in transaction '792-1')

Bye

Thorsten

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Oct 5 16:52:36 2006