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

RE: Update the working copy - again...

From: computergenius <computergenius_at_hotcosta.com>
Date: 2007-12-11 18:20:34 CET

>
>> -----Original Message-----
>> Error: Commit failed (details follow):
>> Error: Out of date: '/trunk/www/controller/Search.php' in transaction
>> '2f'
>> Error: You have to update your working copy first.

>'Error: Out of date' means that someone checked in a new version of the
>file while you were working on it. Run 'svn update' on the file and SVN
>will merge it. You then need to look over the merged file and/or
>resolve any merge conflicts. When you complete the merge, run 'svn
>resolved' on the file. Now you should be able to commit the file.

>However, I'm not sure why you also received the 'Error: You have to
>update your working copy first' message.

Thanks to both you and John.

However, I have run svn update, to no effect.
[pete@122219-web1 controller]$ svn status
M Search.php
[pete@122219-web1 controller]$ svn up Search.php
At revision 79.
[pete@122219-web1 controller]$

... it doesn't appear to do anything. The file on the site is still "double
size", and the time stamp hasn't changed.

Then when I right click on the file to upload it to svn, I still get
Out of date: '/trunk/www/controller/Search.php'

Still confused here...! <G>

-- 
View this message in context: http://www.nabble.com/Update-the-working-copy---again...-tp14277792p14278676.html
Sent from the Subversion Users mailing list archive at Nabble.com.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Dec 11 18:21:05 2007

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.