[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: Bob Proulx <bob_at_proulx.com>
Date: 2006-07-01 04:06:53 CEST

Les Mikesell wrote:
> 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.
> ...
> 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.

Personally I find svnmerge good for merging from the trunk into a
branch. But I have never gotten it to work for merging changes back
from the branch into the trunk. But I did not pursue the problem to
root cause.

Bob

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Sat Jul 1 04:07:52 2006

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