I have a question about when to use --reintegrate. We created a branch called Beta1 that we are using as a temp trunk for now while we try some new changes. Each developer then has a branch that they are making changes in. As necessary we are merging back to Beta1 to test our changes. Should we be using --reintegrate when we merge from the developer branch to Beta1 or just when we finally do Beta1 to trunk?
Asked
Active
Viewed 268 times
2
Bot
- 11,868
- 11
- 75
- 131
1 Answers
3
When you merge Beta1 to trunk.
The tortoise svn documentation is the 'best' (I use 'best' advisedly) explanation I could find. If you have a branch that has been kept up to date with changes made on trunk, reintegrate is used to merge the branch back to trunk; it does some additional checks to ensure that the branch contains any changes made to trunk since its creation.
In your example, this would mean that if Beta1 contains any changes made to trunk since they diverged, --reintegrate will instruct subversion that it's only merging changes that NEW to the Beta1 branch.
SteveMc
- 1,386
- 8
- 11
-
Right. But what about merging our dev branches into the Beta1 branch. Do we need to use reintegrate there? – Bot Sep 02 '11 at 16:42
-
You need to use reintegrate whenever changes on the destination you're merging TO have been applied to where you're merging FROM. If your changes are one way (i.e. dev -> beta1 -> trunk) you shouldn't need --reintegrate at all. If you merge dev -> beta1 -> dev, then you will need it. Look at it as a warning that 'there are incoming changes you already have'. – SteveMc Sep 06 '11 at 20:02