Patchwork [4,of,4,evolve-ext] evolve: fix test-inhibit to match latest hg

login
register
mail settings
Submitter Laurent Charignon
Date Dec. 4, 2015, 10:03 p.m.
Message ID <5f5aed0859a346cb097d.1449266626@lcharignon-mbp>
Download mbox | patch
Permalink /patch/11825/
State Accepted
Headers show

Comments

Laurent Charignon - Dec. 4, 2015, 10:03 p.m.
# HG changeset patch
# User Laurent Charignon <lcharignon@fb.com>
# Date 1449266459 28800
#      Fri Dec 04 14:00:59 2015 -0800
# Node ID 5f5aed0859a346cb097d81d9c182f1dc0d609816
# Parent  44290b46fe3d7b1d8bd4667f577524126dcbff4e
evolve: fix test-inhibit to match latest hg

When I fixed an issue in core about rebaseset 40a2f972f26d (that I introduced
before), it restored the original behavior of inhibit with rebase. This patch
fixes test-inhibit to match the latest hg.
Pierre-Yves David - Dec. 5, 2015, 12:19 a.m.
On 12/04/2015 02:03 PM, Laurent Charignon wrote:
> # HG changeset patch
> # User Laurent Charignon <lcharignon@fb.com>
> # Date 1449266459 28800
> #      Fri Dec 04 14:00:59 2015 -0800
> # Node ID 5f5aed0859a346cb097d81d9c182f1dc0d609816
> # Parent  44290b46fe3d7b1d8bd4667f577524126dcbff4e
> evolve: fix test-inhibit to match latest hg

Thank you very much for getting that boring update out.

Patch

diff --git a/tests/test-inhibit.t b/tests/test-inhibit.t
--- a/tests/test-inhibit.t
+++ b/tests/test-inhibit.t
@@ -429,41 +429,6 @@ 
   |
   o  12:fe1634cbe235 add cK
   |
-  | o  11:53a94305e133 add cL
-  | |
-  | o  10:ad78ff7d621f add cK
-  | |
-  | | @  9:55c73a90e4b4 add cJ
-  | | |
-  | | | o  7:18214586bf78 add cJ
-  | | |/
-  | | o  6:cf5c4f4554ce add cH
-  | | |
-  | | o  5:5419eb264a33 add cG
-  | | |
-  | | o  4:98065434e5c6 add cE
-  | |/
-  o |  3:2db36d8066ff add cD
-  | |
-  o |  2:7df62a38b9bf add cC
-  | |
-  o |  1:02bcbc3f6e56 add cB
-  |/
-  o  0:54ccbc537fc2 add cA
-  
-
-Performing the rebase made ad78ff7d621f and 53a94305e133 visible, we prune
-them to make the graph more legible. It used to be the case that directaccess
-and inhibit were not making these revisions visible. Both behavior are
-acceptable but to keep the test changes minimal we prune those changesets.
-
-  $ hg strip ad78ff7d621f::
-  2 changesets pruned
-  $ hg log -G
-  o  13:2f7b7704d714 add cL
-  |
-  o  12:fe1634cbe235 add cK
-  |
   | @  9:55c73a90e4b4 add cJ
   | |
   | | o  7:18214586bf78 add cJ
@@ -482,6 +447,7 @@ 
   |/
   o  0:54ccbc537fc2 add cA
   
+
 Check that amending in the middle of a stack does not show obsolete revs
 Since we are doing operation in the middle of the stack we cannot just
 have createmarkers as we are creating instability