diff --git a/mercurial/localrepo.py b/mercurial/localrepo.py --- a/mercurial/localrepo.py +++ b/mercurial/localrepo.py @@ -262,7 +262,7 @@ class localrepository(object): def _writerequirements(self): reqfile = self.opener("requires", "w") - for r in self.requirements: + for r in sorted(self.requirements): reqfile.write("%s\n" % r) reqfile.close() diff --git a/tests/test-init.t b/tests/test-init.t --- a/tests/test-init.t +++ b/tests/test-init.t @@ -18,10 +18,10 @@ creating 'local' $ checknewrepo local store created 00changelog.i created - revlogv1 + dotencode fncache + revlogv1 store - dotencode $ echo this > local/foo $ hg ci --cwd local -A -m "init" adding foo @@ -47,8 +47,8 @@ creating repo with format.dotencode=fals $ checknewrepo old3 store created 00changelog.i created + fncache revlogv1 - fncache store test failure @@ -149,10 +149,10 @@ creating 'local/sub/repo' $ checknewrepo local/sub/repo store created 00changelog.i created - revlogv1 + dotencode fncache + revlogv1 store - dotencode prepare test of init of url configured from paths @@ -166,10 +166,10 @@ init should (for consistency with clone) $ checknewrepo "url from paths" store created 00changelog.i created - revlogv1 + dotencode fncache + revlogv1 store - dotencode verify that clone also expand urls @@ -179,10 +179,10 @@ verify that clone also expand urls $ checknewrepo "another paths url" store created 00changelog.i created - revlogv1 + dotencode fncache + revlogv1 store - dotencode clone bookmarks diff --git a/tests/test-lfconvert.t b/tests/test-lfconvert.t --- a/tests/test-lfconvert.t +++ b/tests/test-lfconvert.t @@ -96,11 +96,11 @@ Test link+rename largefile codepath "lfconvert" adds 'largefiles' to .hg/requires. $ cat .hg/requires + dotencode + fncache largefiles revlogv1 - fncache store - dotencode "lfconvert" includes a newline at the end of the standin files. $ cat .hglf/large .hglf/sub/maybelarge.dat