[Svnmerge] svnmerge.py and tags
JL
jeremyl at research.canon.com.au
Thu Aug 7 16:26:12 PDT 2008
Hi all,
We have two groups doing development and each works on their own
long-lived codeline (branch). At the end of each week I merge the new
code from each group's codeline into the trunk. Each group then syncs
their codeline with the trunk the following monday.
The issue I have is how can I make this work with each group 'tagging'
their branch to indicate exactly what they wish to have integrated. For
example, one group may have more code on their branch than they actually
want integrated. To indicate what is to be integrated, they tag their
codeline. It is this tag that I wish to integrate into the trunk. I'm
having a couple of issues with how to work in this situation with svnmerge
1) How do I initialise the tag/trunk so that it can be integrated using
svnmerge.py? The tag is a copy of a branch, not the trunk.
2) If I successfully merge the tag into the trunk, when the development
groups resyncs their branch with trunk, I'm assuming their will be
issues since the merge has come via the tag, not the branch. So the
--bidirectional support will not work correctly.
At the moment, what I'm doing is manually examining the tag to see what
was included on it, but then actually doing the merge from the branch
rather than the tag.
Any help on these would be appreciated.
Regards,
Jeremy
More information about the Svnmerge
mailing list