Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: process missing branches in sorted order
authorMads Kiilerich <mads@kiilerich.com>
Tue, 15 Jan 2013 02:59:14 +0100
changeset 18373 687ed69f6fdf
parent 18372 5965997b7023
child 18374 942ecb55b1de
convert: process missing branches in sorted order
hgext/convert/hg.py file | annotate | diff | comparison | revisions
tests/test-convert-clonebranches.t file | annotate | diff | comparison | revisions 
--- 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
Mercurial