Importing large changes fails

Dear all,

whenever a new linux kernel is released, I have to update my local
working copy of the kernel. This process, however, fails usually for
the following reason:

  svn: Commit failed (details follow):
  svn: MERGE request failed on '/svn/PromethOS/linux/2.6/upstream'
  svn: MERGE of '/svn/PromethOS/linux/2.6/upstream':
      timed out waiting for server (https://xxxxxxxxxxxxxxxxxxxxxx)

Strange to me is the fact that the commit was carried out, at least
post-commit sends an email to all of the specified recipients.

Really annoying is the fact that the local WC remains in a strange
state of unmerged changes. Why?

  komsys-pc-ruf:power!122> svn commit -m "Save"
  Sending power/Makefile
  svn: Commit failed (details follow):
  svn: Your file or directory 'Makefile' 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).

  komsys-pc-ruf:power!123> svn update Makefile
  G Makefile
  Updated to revision 588.

but with newly added files, I run into troubles.

  komsys-pc-ruf:power!127> svn up
  svn: Failed to add file 'smp.c': object of the same name already exists
  komsys-pc-ruf:power!128> svn commit -m "Save smp.c" smp.c
  Adding smp.c
  svn: Commit failed (details follow):
  svn: File '/svn/PromethOS/linux/2.6/upstream/kernel/power/smp.c' already
    exists

One way to solve that problem would be to checkout the HEAD revision
completely. But I do not like that.

Is tere any way I can solve that problem?

Thanks for any help!

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