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

Re: Web Dev Scenario... Branches?

From: Andy Levy <andy.levy_at_gmail.com>
Date: 2006-01-27 21:13:53 CET

On 1/27/06, Bill Bengtson <billbengtson@gmail.com> wrote:
> - 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
> called.

dyndns.org is free and very easy to set up/use.

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

I think you want to commit your changes from Development to the
repository residing on your production server.

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

Work everything through your laptop. Download the blog software
updates to the laptop, drop them in your local working copy, then
merge/commit up to the repository on your hosted server.

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

Sounds overly complex.

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

The latter, assuming the working copy is on your laptop. Then once
it's on the laptop, merge and commit to the repository.

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

I don't even think you need to branch or work with patches. Get the
latest version from the Typo people, merge it into your local working
copy, then commit the resulting "mixed" version to the repository.
You could get patches instead of full downloads from Typo, if they
offer them, but it's not needed.

Alternately, if Typo also uses Subversion, you could maintain a tree
in your repository for Typo and use svk to keep your repository's copy
in sync with theirs. Merge that tree (branch) into your customized
version for your blog when necessary.
Received on Fri Jan 27 21:15:10 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.