Subversion - Do I need to reintegrate if I don't merge from trunk
Posted
by user314584
on Stack Overflow
See other posts from Stack Overflow
or by user314584
Published on 2010-04-12T14:28:08Z
Indexed on
2010/04/12
14:33 UTC
Read the original article
Hit count: 446
Hi,
I have read quite a bit about the need to re-integrate when you merge from a branch back to the trunk in SVN (This article was really helpful http://blogs.open.collab.net/svn/2008/07/subversion-merg.html).
The problem seems to come from the fact that people are regularly updating the branch from the trunk which means that the final merge back is reflective.
In my use-case, we want to create a release branch which will live for as long as it takes to stabilise the branch and fix any bugs. To maintain stability we don't want to merge up from the trunk but we do want to regularly merge fixes down from the release branch so that trunk gets all the bug fixes for free. We also don't want to wait until the end of QA to merge back to trunk. We therefore want to: 1.) Create the branch 2.) Make regular changes to the branch (and trunk) 3.) Merge back to trunk regularly (daily perhaps)
Since we will never merge up from trunk I don't think that we need to worry about the problems that re-intergrating is designed to fix. Can anyone see a problem with this approach?
Cheers, Matt
© Stack Overflow or respective owner