[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: John Peacock <john.peacock_at_havurah-software.org>
Date: 2007-12-11 18:58:20 CET

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.

> ... 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?

> 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?

I'm thinking that there is some miscommunication here, based on your
somewhat vague description of events. Let me lay out what is normally
the scenario involved in developing a website with Subversion.

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

Now, on #1 and #3, there will be a working copy (WC) checked out of #2.
  Normally the flow goes like this:

A) Developer (that's you ;-) makes changes in WC #1 and commits those
changes to #2 (possibly after local testing, but that isn't required,
just smart).

B) The WC on #3 is now out of date and needs to be updated. This is
sometimes done with a post-commit hook on #2, but it could also just be
a manual step ('svn up' on the web server).

C) The web server now has the latest files to display. QED

Does this make sense to you? Can you identify which step you are hung
up on?

John

*) Not to confuse matters, but that is the logical distinction; there is
nothing in theory that would prevent those three activities to occur on
the same physical box.

---------------------------------------------------------------------
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:58:50 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.