diff -r 2be05515b142 -r 4de90774eade tests/test-inhibit.t --- a/tests/test-inhibit.t Wed Feb 01 15:32:59 2017 +0100 +++ b/tests/test-inhibit.t Wed Feb 01 15:40:51 2017 +0100 @@ -551,7 +551,6 @@ |/ o 14:d66ccb8c5871 add cL | - ~ $ hg strip -r 210589181b14 0 files updated, 0 files merged, 1 files removed, 0 files unresolved working directory now at d66ccb8c5871 @@ -573,7 +572,6 @@ |/ o 14:d66ccb8c5871 add cL | - ~ Test prunestrip @@ -589,7 +587,6 @@ | @ 14:d66ccb8c5871 add cL foo | - ~ Check that --hidden used with inhibit does not hide every obsolete commit We show the log before and after a log -G --hidden, they should be the same @@ -821,7 +818,6 @@ $ hg log -G -r "25::" @ 25:71eb4f100663 add pk | - ~ $ hg up -C 22 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit Dk @@ -835,7 +831,6 @@ | o 25:71eb4f100663 add pk | - ~ Create a stack (obsolete with succ in dest) -> (not obsolete) -> (not obsolete). Rebase the first two revs of the stack onto dest, we expect to see one new @@ -857,7 +852,6 @@ |/ o 25:71eb4f100663 add pk | - ~ $ hg prune 28 -s 27 1 changesets pruned $ hg up 25 @@ -878,7 +872,6 @@ |/ @ 25:71eb4f100663 add pk | - ~ 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 @@ -896,7 +889,6 @@ | @ 25:71eb4f100663 add pk | - ~ Pulling from a inhibit repo to a non-inhibit repo should work