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

Re: subversion question

From: Dave Neary <david_at_phenix.fr>
Date: 2004-09-23 11:40:48 CEST

Hi Paul,

Paul William wrote:
> My question/problem is this, I hope it makes sense:
> I need to create a copy of a website (site1 - which is managed with
> subversion) called site2. site2 will be identical to site1 except I will
> be making changes to a few files.
> The problem is that site1 changes very often and I need those changes
> reflected in site2.
> Is there a way to do this in subversion? I really don't want to be
> making a copy of site1 and apply site2 patches every week :(

Your question makes a lot of sense. This is called incremental
branching, and Clearcase does things like this. Files are moved to a
branch only when new revisions are created for them, otherwise the
branch gets all of the files on the branch underneath it. The problems
come when a file on the branch gets changed on the trunk, since the
change in the trunk is hidden and requires a merge.

Subversion doesn't do things like this, however. Depending on the size
of your diffs for site2, your options are limited (as far as I can
tell). You can set up a cron job to automate a merge, and inform you if
conflicts need to be resolved. Or you can maintain site2 as a working
copy of site1 with local changes, and svn up frequently. This presents
the problem of how to version site2 specific changes.

I think that manually merging every few days might be your best option.


David Neary
Phenix Engineering
110 ave Jean Jaures, 69007 Lyon
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 23 11:41:31 2004

This is an archived mail posted to the Subversion Users mailing list.