[PATCH 1 of 2 evolve-ext] inhibit: update test with new behavior from core

Laurent Charignon lcharignon at fb.com
Wed Nov 25 01:19:05 UTC 2015


# HG changeset patch
# User Laurent Charignon <lcharignon at fb.com>
# Date 1448414175 28800
#      Tue Nov 24 17:16:15 2015 -0800
# Node ID 6d694642bfce2d39320f5f1b1d354e902b7fc39c
# Parent  48547b4c77defdd17c670b1eb0eb94272edf0207
inhibit: update test with new behavior from core

The recent changes in core (to make sure that all bookmarks write are done at
the end of a transaction) changed the behavior of inhibit. When one rebases
a set of hidden revs somewhere, the hidden revs become visible at the end of
the rebase. Both the previous behavior and new behavior seems acceptable but
the tests have to be changed subsequently. This patch modifies one of the test
for inhibit when the case mentioned above happens. We prune the revs inhibited
by the rebase to make the change minimal.

diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -414,6 +414,8 @@ With severals hidden sha, rebase of one 
   Warning: accessing hidden changesets ad78ff7d621f,53a94305e133 for write operation
   rebasing 10:ad78ff7d621f "add cK"
   rebasing 11:53a94305e133 "add cL"
+  $ hg strip ad78ff7d621f::
+  2 changesets pruned
   $ hg log -G
   o  13:2f7b7704d714 add cL
   |


More information about the Mercurial-devel mailing list