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

Re: Scripts to support branch/merge strategy

From: Chia-liang Kao <clkao_at_clkao.org>
Date: 2005-01-18 04:55:23 CET

> Has anyone implemented a (hopefully platform independent) set of
> scripts to help automate a simple hierarchical branch/merge strategy?

With svk you can do this trivially.

> I am thinking of something relatively simple which would use
> properties and/or log entries to track and manage a simple branch
> hierarchy and two common types of merges:

Suppose you have //trunk used by development team,
branched (cp'ed) to //qa for the qa team, //release branched from
//qa for the release manager.

> 1) Full integration merges (all changes since the branch point or last
> merge point) from a branch into it's parent (the trunk or branch it
> was copied from).

svk smerge -t //qa will merge all changes from //trunk to //qa.
svk knows where and what to merge from, as it noticed //qa is copied
from //trunk. Similarly, svk smerge -t //release will pull things
from //qa to the relesae branch.

You can also have all the flexibility with things like:
svk smerge //trunk@REV //release, that will pull everything //release
doesn't have from trunk, up to REV of trunk.

> 2) Full update merges (no cherry picking) from the parent to the
> branch. This amounts to re-branching and applying all the same
> changes. In this case, the next merge from the branch to the parent
> needs to use the merge point on the parent as the start marker.

svk smerge -f //qa will merge the otherway around, from //qa to //trunk.


To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 18 04:58:01 2005

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.