On Dec 12, 2007, at 14:26, computergenius wrote:
> Special thanks to John Peacock for going over and over it until it
> sank in!
>
> I was being told to update the working copy from Subversion. But
> it appears
> that working copy means, both the copy on the development machine
> (where I
> type in the code), and the copy on the "production" server.
>
> I was being told to update the working copy. I had assumed that it
> meant
> update the production copy. That is the copy that is doing the
> work, the
> working copy!
The name "working copy" comes from the fact that it is a *copy* of
the code in the repository, and it's where you do your programming
*work* and make changes. But as you see a working copy can also be
used for other tasks, like living on a production web server for the
sake of allowing it to serve up its contents via a web server.
> The answer in my case was, on the development, coding, machine, to
> first
> make a backup of the file. Then Update the file - that is, take a
> copy from
> Subversion BACK to the development machine! Then correct what was
> in this
> downloaded file, with the backup that I had made. Finally Commit
> the code
> back into Subversion.
You don't need to make a backup of the file. You can just "svn
update". If your local files has changes, Subversion will merge the
changes from the repository into your local file and retain your
changes. Or, if changes from the repository affected the same lines
that you've affected in your modified copy, then Subversion will make
a backup copy of the file for you (and a few more files) and mark the
file as being in a state of conflict, for you to manually resolve.
> I trialled it using just one file, so that I could track what was
> happening,
> but as soon as I had the one file sorted, I then did it with all
> files - and
> I am back on-line.
Great. I do want to recommend again, though, that you spend some time
reading the Subversion Book. These are basic questions about how
Subversion works, which you should really get a firm grasp of before
proceeding too much further with the software. The book can be read
online for free here:
http://svnbook.red-bean.com/en/1.4/index.html
Start at the beginning and keep reading.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Wed Dec 12 23:48:17 2007