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

Re: Updating a live website with a post-commit hook script

From: Les Mikesell <lesmikesell_at_gmail.com>
Date: 2006-07-01 00:18:17 CEST

On Fri, 2006-06-30 at 13:11 -0700, Blair Zajac wrote:

> I would look at using svnmerge.py to merge revisions from a trunk, to a QA
> branch to a production branch. svnmerge.py will manage all the metadata for you
> to ensure that only revisions that haven't been merged over will be merged. You
> can also cherry pick revisions to merge.
>
> You can find svnmerge.py in
>
> http://svn.collab.net/repos/svn/trunk/contrib/client-side/

Thanks - I think separate QA and production branches are probably
the cleanest approach and it might even make the production head
jump atomically to the right versions of everything where floating
a CVS tag had a small timing window where things were inconsistent.

But, if there were changes in QA, most of the time these should
go back to the trunk as well - and I don't really care about keeping
a history of the QA branch after it is merged to production.

I'm just trying to make this flow easy enough that no one will ever
try to bypass it or forget to merge (most) QA changes back to the
trunk.

-- 
  Les Mikesell
   lesmikesell@gmail.com
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 1 00:19:44 2006

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