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

Re: Setup...

From: Blair Zajac <blair_at_orcaware.com>
Date: 2006-08-28 08:28:54 CEST

Magnus Andersen wrote:
> Hi All,
> I'm new to subversion but my department is in great need for
> versioning software. I've started to put svn in place when I ran into
> a problem I don't know how to solve. My department does not work on
> large projects, in fact most of them are rather small. I've setup the
> trunk to have a post-commit script that pushes the file out to a
> working directory on our web-server so the developers don't have to
> interact with the server directly.
> My initial thought was to create tags for testing and production and
> when the files/directories were tagged I have another post-commit
> script that pushes the files to the test or production servers.
> My problem is that I only want to move one directory, sometimes only
> one file, to test/production, not the entire trunk.
> Any ideas, thoughts, experiences regarding my dilemma would help.
> Thanks,

Hi Magnus,

The model that I've used is to have a trunk, a qa and production branches, and
all three are checked out on one or more web servers.

When the trunk is good to move to qa, they run a merge from trunk into the qa
branch, and when that branch is declared good, then it is merged into the
production branch.

I use the svnmerge.py script to handle the merging of revisions from trunk to qa
and from qa to production.


Each developer can have a copy of the svnmerge.py script on their system and
merge which ever revisions they want to into the qa branch.

The advantage of this is that you can also cherry-pick revisions to merge. Say
you've got one tiny issue in production, so you fix it in trunk, merge only that
revision to qa, qa it, then merge the qa revision to the production branch.

Next time you go to merge trunk to qa, svnmerge.py will prevent you from
double-merging that fix over.

Finally, you have the post-commit script still do an update of the appropriate
working copy.


Blair Zajac, Ph.D.
Subversion training, consulting and support
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Mon Aug 28 08:30:46 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.