Re: Setup...
From: Blair Zajac <blair_at_orcaware.com>
Date: 2006-08-28 08:28:54 CEST
Magnus Andersen wrote:
Hi Magnus,
The model that I've used is to have a trunk, a qa and production branches, and
When the trunk is good to move to qa, they run a merge from trunk into the qa
I use the svnmerge.py script to handle the merging of revisions from trunk to qa
http://www.orcaware.com/svn/wiki/index.php/Svnmerge.py
Each developer can have a copy of the svnmerge.py script on their system and
The advantage of this is that you can also cherry-pick revisions to merge. Say
Next time you go to merge trunk to qa, svnmerge.py will prevent you from
Finally, you have the post-commit script still do an update of the appropriate
Regards,
-- Blair Zajac, Ph.D. <blair@orcaware.com> Subversion training, consulting and support http://www.orcaware.com/svn/ --------------------------------------------------------------------- To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org For additional commands, e-mail: users-help@subversion.tigris.orgReceived 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.