Pete Clark wrote:
>> 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?
The repository is a special kind of database. What is stored there is not
usable for any purpose except as a repository. Any time you want to see what
files are in the repository, you need to check it out into a working copy. So,
both #1 and #3 require a working copy.
> I was referring to 3) production box
When you resolve things, #3 will need to have 'svn up' run on it, FWIW. SPECIAL
NOTE: when you make a change on #1 (editing and committing), that has nothing to
do with #3, which has an independent working copy and must be managed on its own
(hence the need to run 'svn up').
> On 1) dev box - I can't load the updated file into Subversion.
Can you do the following in the top level of your working copy #1:
svn st -u
Don't use whatever GUI you are using (right click, etc), just run the command
line utility. That command translates to:
Show me the status of my entire working copy, showing me changes that I made
locally, as well as what files are out of date compared to the server.
> 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.
Is this any clearer:
commit moves changes from WC to repository
update moves changes from repository to WC
A) The repository is a specialized database and has to be checked out into
working copies to see the contents
B) Each machine that needs to see the files themselves needs to have a working
copy checked out from the repository
C) Every working copy is completely independent: they each can be used to edit
the files (and then check the changes into the repository), and they each need
to be updated to reflect changes made in the repository.
In your case, you normally only make changes on the Dev (#1) box and commit them
to the repository. The web server has a working copy, but you only ever want to
'svn update' to get the new changes you made.
D) If you were working with some other person, they would have their own
independent working copy (#1b) and you would both be committing your changes and
updating to move each others changes back and forth from your working copies to
the repository.
John
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 12 12:57:10 2007