[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: Ryan Schmidt <subversion-2006Q1_at_ryandesign.com>
Date: 2006-01-27 22:58:22 CET

On Jan 27, 2006, at 20:57, Bill Bengtson wrote:

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

Not quite on-topic for this list, but I can recommend ZoneEdit
(www.zoneedit.com). They offer free DNS service for up to five domain
names, and that includes dynamic DNS if you like. So if you already
have a domain name, you can move its DNS to ZoneEdit, where you'll
probably have more control over it than you did at your previous DNS
provider (your registrar for example) while enabling you to use
dyndns. I've used ZoneEdit for around 5 years, I think, and while
their interface isn't particularly pretty and hasn't gotten a
facelift during that time, I can only recall two very brief periods
where the DNS service was unavailable.

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

If you really need to make modifications to someone else's software,
you'll probably want to keep that software in your repository as a
vendor drop, then copy it to a different path within the repository
and make your changes. Any time you update to a new version of the
vendor project, you can then merge those changes into your custom
version and still retain your changes. You can read up on vendor
branches in the Subversion Book:


If the project you're importing is also using Subversion you may be
able to skip the vendor branch bit; see my response to the second
question in this message:


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 27 22:59:30 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.