diff tests/test-inhibit.t @ 3002:00e4d31b8cdb mercurial-4.1

compat-test: merge future 6.7.0 into 4.1 compat branch

(mergeing through 4.2 compat branch)

--- a/tests/test-inhibit.t	Tue Jul 25 15:17:42 2017 +0200
+++ b/tests/test-inhibit.t	Wed Sep 27 01:12:47 2017 +0200
@@ -159,6 +159,7 @@
   o  0:54ccbc537fc2 add cA
   
   $ hg phase --public 7
+  1 new bumped changesets
   $ hg strip 9
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   working directory now at cf5c4f4554ce
@@ -846,7 +847,7 @@
   created new head
   $ mkcommit Dp
   $ mkcommit Do
-  $ hg log -G -r "25::"
+  $ hg log -G -r "71eb4f100663::"
   @  30:b517facce1ef add Do
   |
   o  29:c5a47ab27c2e add Dp
@@ -858,14 +859,14 @@
   o  25:71eb4f100663 add pk
   |
   ~
-  $ hg prune 28 -s 27
+  $ hg prune 8c1c2edbaf1b -s 1192fa9fbc68
   1 changesets pruned
-  $ hg up 25
+  $ hg up 71eb4f100663
   0 files updated, 0 files merged, 3 files removed, 0 files unresolved
-  $ hg rebase -r "28 + 29" --keep -d 27 --config experimental.rebaseskipobsolete=True
+  $ hg rebase -r "8c1c2edbaf1b + c5a47ab27c2e" --keep -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True
   note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk"
   rebasing 29:c5a47ab27c2e "add Dp"
-  $ hg log -G  -r "25::"
+  $ hg log -G  -r "71eb4f100663::"
   o  31:7d8affb1f604 add Dp
   |
   | o  30:b517facce1ef add Do
@@ -883,11 +884,11 @@
 Rebase the same stack in full on the destination, we expect it to disappear
 and only see the top revision added to destination. We don\'t expect 29 to be
 skipped as we used --keep before.
-  $ hg rebase -s 28 -d 27 --config experimental.rebaseskipobsolete=True
+  $ hg rebase -s 8c1c2edbaf1b -d 1192fa9fbc68 --config experimental.rebaseskipobsolete=True
   note: not rebasing 28:8c1c2edbaf1b "add Dl", already in destination as 27:1192fa9fbc68 "add Dk"
   rebasing 29:c5a47ab27c2e "add Dp"
   rebasing 30:b517facce1ef "add Do"
-  $ hg log -G  -r "25::"
+  $ hg log -G  -r "71eb4f100663::"
   o  32:1d43fff9e26f add Do
   |
   o  31:7d8affb1f604 add Dp