##// END OF EJS Templates
commit: sort subrepos before committing for stable test output
Martin Geisler -
r12127:36a65283 default
parent child Browse files
Show More
@@ -877,7 +877,7 b' class localrepository(repo.repository):'
877 # commit subs
877 # commit subs
878 if subs or removedsubs:
878 if subs or removedsubs:
879 state = wctx.substate.copy()
879 state = wctx.substate.copy()
880 for s in subs:
880 for s in sorted(subs):
881 sub = wctx.sub(s)
881 sub = wctx.sub(s)
882 self.ui.status(_('committing subrepository %s\n') %
882 self.ui.status(_('committing subrepository %s\n') %
883 subrepo.relpath(sub))
883 subrepo.relpath(sub))
@@ -499,8 +499,8 b' test subrepo delete from .hgsubstate'
499 $ hg -R testdelete add
499 $ hg -R testdelete add
500 adding testdelete/.hgsub
500 adding testdelete/.hgsub
501 $ hg -R testdelete ci -m "nested 1 & 2 added"
501 $ hg -R testdelete ci -m "nested 1 & 2 added"
502 committing subrepository nested
502 committing subrepository nested2
503 committing subrepository nested2
503 committing subrepository nested
504 $ echo nested = nested > testdelete/.hgsub
504 $ echo nested = nested > testdelete/.hgsub
505 $ hg -R testdelete ci -m "nested 2 deleted"
505 $ hg -R testdelete ci -m "nested 2 deleted"
506 $ cat testdelete/.hgsubstate
506 $ cat testdelete/.hgsubstate
@@ -529,8 +529,8 b' test repository cloning'
529 $ hg -R main add
529 $ hg -R main add
530 adding main/.hgsub
530 adding main/.hgsub
531 $ hg -R main ci -m "add subrepos"
531 $ hg -R main ci -m "add subrepos"
532 committing subrepository nested_absolute
532 committing subrepository nested_relative
533 committing subrepository nested_relative
533 committing subrepository nested_absolute
534 $ cd ..
534 $ cd ..
535 $ hg clone mercurial/main mercurial2/main
535 $ hg clone mercurial/main mercurial2/main
536 updating to branch default
536 updating to branch default
General Comments 0
You need to be logged in to leave comments. Login now