[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Cannot commit changes after merging from unrelated part of tree

From: Dennis Birkholz <dennis.birkholz_at_nexxes.net>
Date: Thu, 24 Jul 2008 05:56:19 +0200


I have merged a subtree /software/abc into my tree /project/xyz. Both
trees contained no common files and have no combined history and
/project/xyz was created before /software/abc.

When i now try to commit a change made in /project/xyz to a file that is
merged from /software/abc, i got the following errors in the apache log:

Could not CHECKOUT resource /repo/!svn/ver/2734/projects/xyz/myfile.php.
  [409, #0]
resource out of date; try updating [409, #160024]

I tried updating, it does not change anything. In /project/xyz i can
view the complete log/history of the file from /software/abc incl a
compied from /software/abc at rev XY entry.

Updating the file in /software/abc works without any problems. Adding
files to /project/xyz works also, including adding files to subfolders
copied from /software/abc. Commiting changes to files in /software/abc
that where not merged in there also works.

Do anybody has a suggestion?

Thanks you for your help,


Dennis Birkholz
Mobil: +49(0)177 717 95 42
nexxes Informationstechnik GmbH
Widdenhofstr. 15, D-41470 Neuss, Tel.: +49(0)2137-933 78-41, Fax: -42
http://www.nexxes.net - contact@nexxes.net
Amtsgericht Neuss: HRB 13844, Steuernr.: 125/5713/1440
Dennis Birkholz, Sebastian Mumm, Marco Schinkel, Sebastian Schöppel
Bankverbindung: Sparkasse Neuss, BLZ 305 500 00, Konto: 931 661 71
To unsubscribe, e-mail: users-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: users-help_at_subversion.tigris.org
Received on 2008-07-24 08:37:31 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.