title: How do I use the new SVN merge-tracking?
body: <p>In my existing (Pre-SVN 1.5) merge strategy, we create a copy of the Trunk (called BasePoint) at the moment of branch-creation for referencing later during the merge.</p>
  <p>When we need to merge a branch back into the trunk, we perform 2 operations.</p>
  <ol>
  <li><p>Merge from BasePoint to LatestTrunk (Trunk has likely moved on since the original branch) into Working copy of Branch and then commit.</p>
  <p>At this point we typically check that the merge into the branch has not damaged anything</p>
  </li>
  <li><p>Merge from LatestTrunk to LatestBranch back into Working copy of trunk and then commit.</p>
  </li>
  </ol>
  <p>Documentation suggests that I use the new reintegrate merge on the Trunk and Merge from the Branch.</p>
  <p><strong>Do I need to merge from the trunk into the dev branch first or is this included in the new reintegrate option?</strong></p>
  <p>To put it another way, does the new <code>merge --reintegrate</code> functionality represent 'each of my previous merges' or 'the whole operation' ?</p>
  <p>(FWIW I am using TortoiseSVN 1.5.1)</p>