How to reintegrate with automatic merge (merge-tracking) in TortoiseSVN 1.8

394 Views Asked by At

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?

1

There are 1 best solutions below

1
Patrick Quirk On BEST ANSWER

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.