From 0942e94dcc26dab1394b802ef706fe627dcccaf1 Mon Sep 17 00:00:00 2001 From: Durham Goode Date: Mon, 20 Mar 2017 18:58:09 -0700 Subject: [PATCH] treemanifest: reverse historypack entries History pack entries need to be in newest-to-oldest order, so let's reverse them. --- tests/test-treemanifest-autoconvert.t | 4 ++-- treemanifest/__init__.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/test-treemanifest-autoconvert.t b/tests/test-treemanifest-autoconvert.t index c60d6784f8..8e2ab14078 100644 --- a/tests/test-treemanifest-autoconvert.t +++ b/tests/test-treemanifest-autoconvert.t @@ -53,9 +53,9 @@ Test auto creating trees for merge commit $ hg manifest -r tip x z - $ hg debughistorypack $TESTTMP/hgcache/master/packs/manifests/1e23508fdb2c2598bfaad1777f1c8e05d3fdcb60 + $ hg debughistorypack $TESTTMP/hgcache/master/packs/manifests/5efcf6ea7ccfd8b6ac303c0f6b5a9cd73682e295 Node P1 Node P2 Node Link Node Copy From - ddb35f099a64 000000000000 000000000000 d32fd17cb041 13532a598745 bc0c2c938b92 000000000000 92f4ca0e667c + ddb35f099a64 000000000000 000000000000 d32fd17cb041 diff --git a/treemanifest/__init__.py b/treemanifest/__init__.py index 30e235aa90..d61127bdf1 100644 --- a/treemanifest/__init__.py +++ b/treemanifest/__init__.py @@ -572,7 +572,7 @@ def recordmanifest(datapack, historypack, repo, oldtip, newtip, verify=False): ui.progress(message, None) for filename, entries in sorted(historyentries.iteritems()): - for entry in entries: + for entry in reversed(entries): historypack.add(filename, *entry) def _checkhash(orig, self, *args, **kwargs):