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

Merge tracking tool for 1.4.x branch

From: Blair Zajac <blair_at_orcaware.com>
Date: 2006-03-01 20:01:38 CET

I'd like to put on the radar screen that whoever is the release/merge manager
for our 1.4.x branch should probably use some merge tracking tool to manage
revisions merged from trunk into the branch. I would also like to propose using
the svnmerge.py currently located in contrib/client.

As far as I am aware, a merge tracking feature is not going to make it into a
1.4.0 release, so I think we should at least start working with a tool that
helps manages the process. This will give us a better understanding of the
issues first hand of automatically tracking revisions.

Svnmerge.py just uses a single svnmerge-integrated property in the branch
receiving the merges to keep track of available revisions to merge. So we're
not talking about an invasive tool here.

I can already see that svnmerge.py would probably need some work to handle our
merge branches, that is branches of the 1.4.x branch that we create to handle
merges from trunk that would not apply cleanly directly to the 1.4.x branch. It
would need some work to track revisions that original are merged into the merge
branch and then merged back into 1.4.x.

BTW, I did start to look at setting up an svnmerge.py's metadata on the
branches/1.3.x-svnmerge.py branch, but it just got too messy since the 1.3.x has
no merge information. So starting a new 1.4.x branch with some tool should be a


Blair Zajac, Ph.D.
Subversion training, consulting and support
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Mar 1 20:03:31 2006

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