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

Scripts to support branch/merge strategy

From: <bbosch_at_iphase.com>
Date: 2005-01-11 06:57:58 CET

Greetings,

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

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:

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).

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.

While these types of merges are not difficult to perform and track by
hand using the existing Subversion commands, automating them could
save many needless errors and ease the transition to Subversion for
developers who are used to other SCM systems or even those with little
SCM experience.

I know that the project plans to implement full merge tracking
semantics later, but it seems that restricting the automation to
simple merges to or from the parent of a branch should allow a fairly
straightforward implementation via scripts. Does anyone have a set of
scripts they are willing to share?

I know these ideas have been discussed before and I've spent some time
searching the list archives for such scripts because I thought
this would be a common need, but I haven't yet found anything.

I'm not currently on the list so please copy me on any replies.

Thanks!

--Brad Bosch

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Tue Jan 11 07:46:56 2005

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