Patchwork [evolve-ext] tests: fix test-prune.t breakage

login
register
mail settings
Submitter Durham Goode
Date April 8, 2014, 12:11 a.m.
Message ID <34e8c8ad63ba620d5cda.1396915868@dev2000.prn2.facebook.com>
Download mbox | patch
Permalink /patch/4273/
State Not Applicable
Headers show

Comments

Durham Goode - April 8, 2014, 12:11 a.m.
# HG changeset patch
# User Durham Goode <durham@fb.com>
# Date 1396914089 25200
#      Mon Apr 07 16:41:29 2014 -0700
# Branch stable
# Node ID 34e8c8ad63ba620d5cda5982d54db6f746f9d105
# Parent  6a67606e1c3456c603707fe57e8404af5e33a1bd
tests: fix test-prune.t breakage

test-prune.t was broken due to 91d28bd0e04e in upstream Mercurial, which made
hidden commits visible when a local tag made the commit reachable. The fix is to
delete the tag in the test.

Patch

diff --git a/tests/test-prune.t b/tests/test-prune.t
--- a/tests/test-prune.t
+++ b/tests/test-prune.t
@@ -236,6 +236,7 @@ 
   bookmark 'nostrip' deleted
   abort: nothing to prune
   [255]
+  $ hg tag --remove --local a
   $ hg prune -B todelete
   1 changesets pruned
   0 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -252,6 +253,7 @@ 
   $ hg prune -B delete
   3 changesets pruned
   bookmark 'delete' deleted
+  $ hg tag --remove --local c
   $ hg id -ir 6:2702dd0c91e7
   abort: unknown revision '2702dd0c91e7'!
   [255]