out-of-date problem -- I don't get it

Dear all,

I applied a patch to linux within a working copy.

Then I added the new files to the repository by 'svn add'.

When I tried to commit, a server timeout happened due to whatever
reasons. Hence, I set in '~/.subversion/servers' the timeout value
accordingly and tried to commit again. What followed was an
'out-of-date' error message.

Crawling the documentation led me to to 'svn update'.

This however, resulted in 'reverts'. So, I interrupt this process by
Ctrl-C because applying the patch cost me already sufficient time.

The problem now is: I cannot commit the local modifications.

  komsys-pc-ruf:2.6.6!62> svn status -v -u CREDITS
  M * 165 165 ruf CREDITS
  Status against revision: 166
  komsys-pc-ruf:2.6.6!63> svn commit -m "saving CREDITS" CREDITS
  Sending CREDITS
  svn: Commit failed (details follow):
  svn: Your file or directory 'CREDITS' is probably out-of-date
  svn:
  The version resource does not correspond to the resource within the
  transaction. Either the requested version resource is out of date
  (needs to be updated), or the requested version resource is newer
  than the transaction root (restart the commit).

My question: how can I solve this problem without losing my changes?

Thanks!

wbr,
Lukas

-- 
Lukas Ruf           | Wanna know anything about raw |
<http://www.lpr.ch> | IP? -> <http://www.rawip.org> |
eMail Style Guide: <http://www.rawip.org/style.html>|
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org