[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: H. S. Teoh <hsteoh_at_quickfur.ath.cx>
Date: 2004-09-23 16:59:37 CEST

On Thu, Sep 23, 2004 at 08:54:18PM +1200, Paul William wrote:
[...]
> 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 :(
[...]

It would seem to me that a simple branch-and-tag procedure should
work (unless I'm missing something?):

- start off by making a branch of site1 (say, in /branches/site2)
- tag current version of site1 (say, as /tags/1.0)
- make necessary changes to make it suitable for site2
- continue making frequent changes to site1
- when it's time to move site1 changes to site2, merge site1 into
  site2 (using /tags/1.0 as the base revision). This should preserve
  the changes you made to site2 originally, unless there are conflicts
  (in which case you need to manually fix it anyway)
- tag the current version of site1 as /tags/2.0
- continue making changes to site1
- at the next merge, merge from /tags/2.0 to HEAD instead, and tag
  that as /tags/3.0
- and so on.

I hope this makes sense.

T

-- 
"Computer Science is no more about computers than astronomy is about
telescopes." -- E.W. Dijkstra
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 23 17:01:48 2004

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