Changes between Version 16 and Version 17 of ImprovingPractices

Timestamp:

Apr 22, 2012, 9:00:59 AM (11 years ago)

Author:

viboes

Comment:

Added CLI merge commands

ImprovingPractices

@@ -125 +125 @@
 Detailed procedure for merging:
 
- * Verify that the library meets all release criteria. '''Important:''' Libraries must not be merged into the release trunk until they are passing all trunk tests (or the failures marked-up) and are otherwise fully [#Release-ready release-ready].
-
+* Verify that the library meets all release criteria. '''Important:''' Libraries must not be merged into the release branch until they are passing all trunk tests (or the failures marked-up) and are otherwise fully [#Release-ready release-ready].
+
+* Merge
+ * Command line:
+   * Start with a working copy of https://svn.boost.org/svn/boost/branches/release.
+   * Go to the release branch directory where the merge will take place.
+{{{
+cd <rel>/<directory_path>
+}}}
+   * Merge the directory or a specific file from trunk
+{{{
+svn merge <trunk>/<directory_path>@HEAD
+
+svn merge <trunk>/<directory_path>/<file_name>@HEAD
+}}}
  * TortoiseSVN:
    * Start with a working copy of https://svn.boost.org/svn/boost/branches/release.
@@ -137 +150 @@
      * Click "Dry run" button to be sure setup is correct.
      * Click "Merge". (Note that this modifies your working copy, not the repository.)
-   * Inspect resulting working copy for correctness.
-   * Commit working copy changes.
-
- * '''Watch test results closely; Revert if merge causes any problems whatsoever.'''
+
+* Inspect resulting working copy for correctness.
+* Run the test with as many compilers as you can.
+* Commit working copy changes.
+
+* '''Watch test results closely; Revert if merge causes any problems whatsoever.'''
 
 === Special case: Prerequisite components ===