"Out of date txn" not fixed by updating - what to do?

I have a branch in my SVN repository. I am the only user working in
this branch.

This morning, I merged about 150 revisions from the trunk into my
personal branch. I resolved a half dozen conflicts, rebuilt, tested,
and then tried to commit my updates.

About 1100 files into it, I get:

   svn: Commit failed (details follow): svn: Out of date:
   '/branches/swig1.3.31/acs/Install/Phase1/image/common/DITA-OT/xsl' in
   transaction '1421-1'

If I run:

   svn status -u

... the 8th column is always blank (meaning everything in my working
copy is up to date).

I have done several updates since I first got that error. I am the
only person committing to that branch, so it is not a race condition
between multiple users. I am updating the entire branch.

My SVN client is 1.4.5.25188. I have done:
- updates to my branch (more than once!), it reports I am up to date
- cleanups (no issues found)
- check for mods (no conflicts found)
- updates to the trunk (shouldn't matter but what the heck)

On the SVN server (also 1.4.5.25188), I have run:
- svnadmin lstxns
- svnadmin lslocks
- svnadmin list-unused-dblogs
- svnadmin verify

All report no issues.

How can I commit my updates?

Thanks,
/ John (mcnelly.org)

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Nov 7 07:31:02 2007