Docs for reintegration unclear

My root question would be: do I use the branch or trunk working copy to reintegrate a featured branch back into the trunk?

I was using TortoiseSVN 1.7.9 and just finished synchronizing my development branch with the trunk. I.e. from the branch working copy doing a "Merge a range of revisions".

I was about to reintegrate the branch back into the trunk when I noticed TortoiseSVN 1.8.2 was available. So, I upgraded my client.

This is where the confusion starts.

With 1.7.9; if I wanted to reintegrate I'd run the "Reintegrate a branch" _from_the_trunk_. However, the merging feature seems to be improved. Fantastic! But, the documentation is unclear at best.

TortoiseSVN-1.8.2-en.pdf section 4.20.7 says to use "Merge reintegrate"; but, it doesn't say which working copy to run this from, the branch or trunk. By not specifying which working copy to use, it seems to suggest this should be done from the branch working copy. Very different than what I've always done.

However, counter to this, SVN's documentation explicitly says to use the trunk working copy. Ref: http://svnbook.red-bean.com/en/1.8/svn.branchmerge.basicmerging.html#svn.branchmerge.basicmerging.reintegrate

For TortoiseSVN developers: this change seems to have happened because of issue 516 / r24540.

Thank you,
Marshall

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3063924

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-04 20:32:34 CEST