[pypy-svn] r80045 - pypy/extradoc/planning/hg-migration

[antocuni at codespeak.net]

Author: antocuni
Date: Mon Dec 13 23:54:43 2010
New Revision: 80045

Added:
   pypy/extradoc/planning/hg-migration/active-branches-howto.txt
      - copied, changed from r80044, pypy/extradoc/planning/hg-migration/merge-howto.txt
Removed:
   pypy/extradoc/planning/hg-migration/merge-howto.txt
Log:
rename the file, and add a paragraph for how to import svn externals


Copied: pypy/extradoc/planning/hg-migration/active-branches-howto.txt (from r80044, pypy/extradoc/planning/hg-migration/merge-howto.txt)
==============================================================================
--- pypy/extradoc/planning/hg-migration/merge-howto.txt	(original)
+++ pypy/extradoc/planning/hg-migration/active-branches-howto.txt	Mon Dec 13 23:54:43 2010
@@ -1,7 +1,32 @@
 .. -*- mode: rst -*-
 
+Complete the migration of active branches
+==========================================
+
+Now that the SVN repo has been migrate to mercurial, there are two small steps
+that have to be done manually if you want to continue the devlopment of a
+branch:
+
+  1. import the svn externals
+
+  2. tell mercurial the last revision where you "merged from trunk", to avoid
+     false conflicts during the merge
+
+Import the svn externals
+-------------------------
+
+This is easy. There is already a changeset that contains all the needed
+externals (as subrepo), you just need to merge it into your branch::
+
+    $ hg up the-name-of-your-branch
+
+    $ hg merge -r bf2c629d0071
+
+    $ hg ci -m 'import svn externals into the branch'
+
+
 How to merge existing SVN branches in mercurial
-================================================
+------------------------------------------------
 
 This document applies to branches that: