[PATCH 1 of 2 evolve-ext] tests: update tests to work with upstream 2b6692

Durham Goode durham at fb.com
Tue May 16 17:40:46 UTC 2017


# HG changeset patch
# User Durham Goode <durham at fb.com>
# Date 1494956340 25200
#      Tue May 16 10:39:00 2017 -0700
# Node ID 745facc836f8cbdb4c2b9209f1a6bdb31446f144
# Parent  2241433a77e543ee068039fa2fb9ad514decca93
tests: update tests to work with upstream 2b6692

Upstream commit 2b6692df1bdf changed when caches are processed, which results in
getid having debug output in test-obsolete.t. Let's manually call getid to force
the output before we try to use getid in the following command.

diff --git a/tests/test-obsolete.t b/tests/test-obsolete.t
--- a/tests/test-obsolete.t
+++ b/tests/test-obsolete.t
@@ -668,6 +668,10 @@ Check divergence detection (note: multip
   update: (2|9|11) new changesets, (3|9|10) branch heads \(merge\) (re)
   phases: 3 draft
   bumped: 1 changesets
+# Call getid to force get the cache output out of the way
+  $ getid a7a6f2b5d8a5
+  a7a6f2b5d8a54b81bc7aa2fba2934ad6d700a79e
+  truncating cache/rbc-revs-v1 to 112
   $ hg debugobsolete `getid a7a6f2b5d8a5` `getid 50f11e5e3a63`
   $ hg log -r 'divergent()'
   changeset:   12:6db5e282cb91


More information about the Mercurial-devel mailing list