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

[antocuni at codespeak.net]

Author: antocuni
Date: Tue Nov 30 13:32:28 2010
New Revision: 79667

Modified:
   pypy/extradoc/planning/hg-migration/merge-howto.txt
Log:
clarify a bit


Modified: pypy/extradoc/planning/hg-migration/merge-howto.txt
==============================================================================
--- pypy/extradoc/planning/hg-migration/merge-howto.txt	(original)
+++ pypy/extradoc/planning/hg-migration/merge-howto.txt	Tue Nov 30 13:32:28 2010
@@ -14,7 +14,8 @@
 
 The problem with "merge from trunk" is that mercurial does not know that we
 have already applied a set of changes in our branch, so it tries to redo them
-and we get false conflicts.
+(plus all the other changes that were done on trunk) and we get false
+conflicts.
 
 To solve, we need to explicitly tell mercurial that trunk has already been
 merged into our branch up to the right revision: