# HG changeset patch # User Mads Kiilerich # Date 1358215154 -3600 # Node ID 687ed69f6fdfb4e5c2354ed172acdf996b7692c0 # Parent 5965997b70235e768c4244454afae5ca86b3caaa convert: process missing branches in sorted order diff -r 5965997b7023 -r 687ed69f6fdf hgext/convert/hg.py --- 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)) diff -r 5965997b7023 -r 687ed69f6fdf tests/test-convert-clonebranches.t --- 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