diff -r bbf897714e70 -r 27445da063b7 tests/test-inhibit.t --- a/tests/test-inhibit.t Thu Apr 14 03:42:48 2016 +0000 +++ b/tests/test-inhibit.t Thu Apr 14 13:02:23 2016 -0700 @@ -536,6 +536,7 @@ |/ 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 @@ -557,6 +558,7 @@ |/ o 14:d66ccb8c5871 add cL | + ~ Test prunestrip @@ -572,6 +574,7 @@ | @ 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 @@ -803,6 +806,7 @@ $ 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 @@ -816,6 +820,7 @@ | 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 @@ -837,6 +842,7 @@ |/ o 25:71eb4f100663 add pk | + ~ $ hg prune 28 -s 27 1 changesets pruned $ hg up 25 @@ -857,6 +863,7 @@ |/ @ 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 @@ -874,6 +881,7 @@ | @ 25:71eb4f100663 add pk | + ~ Pulling from a inhibit repo to a non-inhibit repo should work