No such revision - how to fix?

I'm running svn 1.2.1 on OS X 10.4.2. I may have fouled things up
when I upgraded my operating system, and now svn is confused.

If I try to commit a change, I get a response like:

    Sending sip/sip.info
    svn: Commit failed (details follow):
    svn: File not found: transaction '4-1', path '/sip/sip.info'

If I dig a bit deeper, I see:

     % svn -v status
     ? sip.info.0937
                     5 5 root .
                     5 5 root sip notes
     M 5 5 root sip.info

     % svn log
     svn: No such revision 5

I didn't think about svn during the OS upgrade, and I didn't get a
backup of the svn repository, but I did get a backup of my working
copy. I later restored the latest svn backup I had, so I think the
source of my problem is that the working copy is "newer" than my
current repository. What is the best way to get svn working again,
while keeping the various newer files that are in my working copy,
while keeping the older versions that are in the repository?

Thanks,

Kevin Horton
Ottawa, Canada

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 8 04:12:51 2005