Changes between Version 17 and Version 18 of ImprovingPractices


Ignore:
Timestamp:
Apr 27, 2012, 8:06:03 AM (10 years ago)
Author:
jeffrey.hellrung
Comment:

updating merge instructions for TortoiseSVN

Legend:

Unmodified
Added
Removed
Modified

  • ImprovingPractices

    v17 v18  
    143143   * Start with a working copy of https://svn.boost.org/svn/boost/branches/release.
    144144   * Select the directory and/or files to be merged.
    145    * Right-click selection for context menu, and TortoiseSVN > Merge...
     145   * Right-click selection for context menu, and "TortoiseSVN" > "Merge..."
     146   * For recent versions of TortoiseSVN (e.g., 1.7.6+):
     147     * Select "Merge a range of revisions"; click "Next >".
     148     * Populate "URL to merge from": https://svn.boost.org/svn/boost/trunk/...
     149     * Leave "Revision range to merge" empty to merge all revisions (typical).
     150     * Click "Next >".
     151     * Click "Test merge" to be sure the setup is correct.
     152     * Click "Merge". (Note that this modifies your working copy, not the repository.)
     153   * For older versions of TortoiseSVN:
    146154     * From: https://svn.boost.org/svn/boost/branches/release/...
    147155     * To: '''Uncheck''' the Use "From:" URL checkbox.