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

Tagging + branching

From: Monks, Peter <peter.monks_at_vignette.com>
Date: 2004-09-30 23:18:51 CEST

G'day everyone,

Looking for a bit of best practice guidance concerning the concurrent
creation of tags and branches for releases.

The background is that I'm working on a project that is in a fairly
typical "maintenance" phase - the system has been live for some time
and we have ongoing, regular releases containing bugfixes, new
functionality etc. For each release, I'd like to create both a tag
and a branch of the entire source code tree - the tag allows us to
easily see exactly what the code that we released looks like while the
branch allows us to modify the released version of the software (ie.
fix urgent bugs in the live system) without disrupting the ongoing
work for the next scheduled release.

So to support this we have what I think is a fairly standard repository
layout:

    MyProject
        tags
            NightlyBuilds
                YYYY-MM-DD
            Releases
                X.Y.Z
        branches
            Developer
                Ernie
                Bert
                Snuffleupugus
                Big Bird
            Releases
               X.Y.Z
        trunk
            ...

and my question is what is the best way to populate this structure at
the time a new release is created?

My first thought was that our release process would just copy from
trunk/ to tags/Releases/X.Y.Z then copy from the newly created tag to
branches/Releases/X.Y.Z, but then the thought struck me that this
might make merging from the branch back into the trunk more difficult
than it needs to be (we don't ever want to merge back into the tag -
we're treating tags as read only - and no I still don't know whether
or not I like the idea of read only copies! ;-)

So then some alternatives came to mind:
1. copy trunk/ to branches/Releases/X.Y.Z first, then copy from there
   to tags/Releases/X.Y.Z
2. copy trunk/ to both branches/Releases/X.Y.Z and tags/Releases/X.Y.Z
   (but what to do if there is an update to the trunk in between the
   two copies?)

Or maybe the order of copies doesn't affect our ability to merge
changes to the branch back into the trunk?
 
Thanks in advance for any light you can shed on the subject!

Cheers,
Peter

----------------------------------------------------------------------
Peter Monks http://www.sydneyclimbing.com/
pmonks_at_sydneyclimbing.com http://www.geocities.com/yosemite/4455/
----------------------------------------------------------------------

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Thu Sep 30 23:19:32 2004

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