>computergenius wrote:
>> 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]$
>
>At this point, you should do 'svn ci Search.php' from your working copy
>and see if that updates the repository (which is should). NOTE that
>normally you want to do 'svn up' without the specific filename, so you
>get _all_ of the changes that may have happened since the last time you
>updated. This is especially true if you are committing from the web
>server *and* your dev box.
>There are three logical[*] entities involved here:
>
>1) Dev box - where the web pages are actually written
>2) Subversion server - where the repository of files lives
>3) Production box - where the web site is actually stored for display
This is where terminology issue start... I haven't been able to figure
out what is meant by "working copy"... is it generally meant to be 1)
or 3) - or both?
>
>> ... it doesn't appear to do anything. The file on the site is still
>> "double
>> size", and the time stamp hasn't changed.
>
>When you say "on the site" are you referring to a web site which has a
>checked out copy of the repository or are you talking about the
>repository itself?
I was referring to 3) production box
>
>> Then when I right click on the file to upload it to svn, I still get
>> Out of date: '/trunk/www/controller/Search.php'
>
>When you are doing this, what machine are you on?
On 1) dev box - I can't load the updated file into Subversion.
The problem is, I have been through the manuals, but can't get it clear
in my head *which* version of the code is being referred to. Up until
this week, I have had no problem with getting the code from Subversion
to Dev, updating it on Dev, moving it back to Dev, then moving it from
Subversion to Production.
As I have mentioned before, there is only myself, and I have full FTP
access if it's needed - I just can't figure out what Subversion is
complaining about, so I can't fix it.
--
View this message in context: http://www.nabble.com/Update-the-working-copy---again...-tp14277792p14290777.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 Wed Dec 12 09:31:48 2007