changeset 18373:687ed69f6fdf

convert: process missing branches in sorted order
author Mads Kiilerich <mads@kiilerich.com>
date Tue, 15 Jan 2013 02:59:14 +0100
parents 5965997b7023
children 942ecb55b1de
files hgext/convert/hg.py tests/test-convert-clonebranches.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/convert/hg.py	Tue Jan 15 02:59:14 2013 +0100
+++ b/hgext/convert/hg.py	Tue Jan 15 02:59:14 2013 +0100
@@ -110,7 +110,7 @@
 
         if missings:
             self.after()
-            for pbranch, heads in missings.iteritems():
+            for pbranch, heads in sorted(missings.iteritems()):
                 pbranchpath = os.path.join(self.path, pbranch)
                 prepo = hg.peer(self.ui, {}, pbranchpath)
                 self.ui.note(_('pulling from %s into %s\n') % (pbranch, branch))
--- a/tests/test-convert-clonebranches.t	Tue Jan 15 02:59:14 2013 +0100
+++ b/tests/test-convert-clonebranches.t	Tue Jan 15 02:59:14 2013 +0100
@@ -82,7 +82,7 @@
   pulling from branch0 into branch2
   4 changesets found
   0 c3
-  pulling from branch2 into branch3
+  pulling from branch1 into branch3
   5 changesets found
-  pulling from branch1 into branch3
+  pulling from branch2 into branch3
   1 changesets found