1

I've read both these release notes for SVN 1.8 and this question concerning reintegration of a branch with SVN 1.8.

My questions, which I couldn't find an answer to, is the following:

Is there any difference between choosing

  1. all revisions
  2. specific range together with an empty box

in the Tortoise Merge-Dialogue when reintegrating a branch into the trunk?

Does Turtoise in either case use an automatic merge with merge-tracking? How can I verify that?

Community
  • 1
  • 1
Joerg
  • 790
  • 2
  • 10
  • 23
  • See the answer about differences in merges in TortoiseSVN 1.7 vs 1.8 http://stackoverflow.com/a/25525371/761095 – bahrep Nov 07 '14 at 11:11
  • Thanks for the link, but that doesn't answer my question. I know the basic differences between the old and the new way of reintegration in SVN (with and without --reintegrate option). What I want to know is the difference between the Turtoise settings stated above. I can't find anything about this in your linked answer. – Joerg Nov 07 '14 at 11:37

1 Answers1

3

According to the documentation, checking "all revisions" is the same as checking "specific range" and leaving an empty box. In both cases, an automatic merge is used:

If you leave the range of revisions empty or have the radio button all revisions checked, then Subversion merges all not-yet merged revisions. This is known as a reintegrate or automatic merge.

Patrick Quirk
  • 23,334
  • 2
  • 57
  • 88
  • Oops, I totally missed that sentence in the documentation. Thanks for pointing me to it. – Joerg Nov 10 '14 at 13:33