'Out of date' merging branch to trunk with replaced file

Hi, I'm rather puzzled by this sequence of events.

I'm doing day-to-day work in branches/dev, and trunk tracks what's
currently running on the server.

r964 is currently running on the server, at which point both trunk and
dev were synchronized with each other. The old
backend/core/src/Search.php was deleted in r986, and the rewritten
version added with no history in r987. Current HEAD is r1039.

Now I am unable to merge those changes back to trunk. I made one attempt
that was slightly broken (as I think it would attempt to re-apply a
change made to trunk in r1007) as such:

  $ pwd
  /.../trunk-wc

  $ svn merge -r964:1039 svn://SERVER/REPOS/PROJECT/branches/dev
  # with only the troublesome file shown
  D backend/core/src/Search.php
  A backend/core/src/Search.php

  $ svn st
  R + backend/core/src/Search.php

  $ svn ci
  Replacing backend/core/src/Search.php
  Transmitting file data
................................................svn: Commit failed
(details follow):
  svn: Out of date: '/PROJECT/trunk/backend/core/src/Search.php' in
transaction '1039-1'

  $ svn up
  svn: Working copy path 'backend/core/src/Search.php' does not exist in
repository

I went and re-read the svn book on merging, then checked out a fresh
working copy and tried the merge again:

  $ pwd
  /.../new-trunk-wc

  $ svn merge svn://SERVER/REPOS/PROJECT/trunk_at_1039
svn://SERVER/REPOS/PROJECT/branches/dev_at_1039

Unfortunately this merge leads to the exact same results. I also get the
same error if I do 'svn up' on the staging server before trying to merge
there. All svn client/servers involved are "version 1.3.2 (r19776)".

I think the error I'm getting when trying to 'svn up' after the commit
fails is sensible; the _new_ Search does not exist in trunk, because the
commit _failed_. And 'svn ls' on the repository URL confirms no new
files have been added, or old ones deleted.

But I'm still at a loss as to how to fix the underlying problem. It
doesn't seem to be addressed in FAQ (as the network didn't collapse, the
commit really didn't happen, and 'svn up' or even the 'fresh checkout'
sledgehammer fix it), and all the 'out of date' threads I found in the
list archives point to the FAQ answer.

-- 
Chad Daelhousen
"Television shepherds with living room sheep/ And I pray"
   --Temple of the Dog, "Wooden Jesus"
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org