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

Web Dev Scenario... Branches?

From: Bill Bengtson <billbengtson_at_gmail.com>
Date: 2006-01-27 20:57:51 CET

- My Production site is on a Debian 3.1 Linux Shared Hosting server.
My host (Dreamhost) does have Subversion installed on this server, but
I do not know which version it is.
- I do my Development on my Windows XP laptop (server) & upload the
files to the Production Linux Server. My laptop is mobile obviously,
using different Internet connections & IP addresses all the time, so I
don't believe that I can put a Subversion Server on the laptop &
expect my Prod Server to ever find the laptop's Repository… correct? I
do not want to pay for or setup an account with somebody to give my
dynamic IP address a static DNS listing, or whatever that is properly

Currently I am not using Subversion on my Production Server, I am only
using Subversion on my Development Laptop to download the latest Trunk
from Typo (my blog software) & then I am SFTP'ing all of the files up
to my Prod Server – overwriting the entire Prod files.

I want to keep downloading the latest Trunk, but I also want to start
use Subversion to upload my files to my Prod Server, instead of SFTP.
I work on these files alone, so I like Subversion not for the "team"
benefits, but for the benefits of uploading & downloading only the
edited files and avoid waiting the hour for the entire directory to be
uploaded... which often times I don't even get 100% of the files to

So I'm confident that I need to set up a Subversion Repository on my
Prod server. This will be for me to upload my Development files from
my laptop to the Prod server Repository. Currently, I only have my
blog software that would be in the Repository hierarchy, but in the
near future I will be adding a few other projects besides just the
blog project, which all will be related to my site, but go beyond the
scope of a blog.

I have been reading the Subversion docs, but I do not understand how
to apply it to my scenario. My confusion sets in when I realize that I
will still be downloading the latest Trunk files, yet uploading to a
Repository on my Prod server. How can one Repository both receive the
latest Trunk from the Typo people, as well as receive edited versions
of those same files from me on my Development laptop, yet download the
latest Trunk files from Typo again later & not totally wipe out my own
personal edits in some of the files? All this while keeping everything
in-sync & not stepping on each others toes?

1. Do I end up having 2 separate Repositories, one for my Typo blog
Trunk downloads and one for my own edited version of the official Typo
blog files that will be used on my Prod server?
2. When I want to download from the Typo blog Trunk Repository, do I
download that to my Prod server and then down to my laptop in a two
steps, or do I download the latest Trunk from Typo directly to my
3. Do I use the same Repository on my Prod server to receive the
latest Trunk files from the Typo people as well as use this same
Repository on the Prod server to receive my edited files up from my
Development laptop? Is this were things like "commit", "update",
"branch" & "patch" come into play?

Thank you for your time in reading this & offering me any advice or
guidance that you can.
Received on Fri Jan 27 21:00:36 2006

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.