tests/test-inhibit.t
changeset 1292 62229e7451f7
parent 1241 3625d006e81b
child 1294 d1c29db2e055
--- a/tests/test-inhibit.t	Wed Apr 29 11:42:06 2015 -0700
+++ b/tests/test-inhibit.t	Mon Apr 06 15:44:00 2015 -0700
@@ -495,4 +495,35 @@
   |
   o  0:54ccbc537fc2 add cA
   
+Check that rebasing a commit twice makes the commit visible again
 
+  $ hg rebase -d 18 -r 16 --keep
+  rebasing 16:a438c045eb37 "add cN"
+  $ hg log -r 14:: -G
+  o  19:104eed5354c7 add cN
+  |
+  @  18:210589181b14 add cM
+  |
+  | o  16:a438c045eb37 add cN
+  | |
+  | o  15:2d66e189f5b5 add cM
+  |/
+  o  14:d66ccb8c5871 add cL
+  |
+  $ hg prune -r 104eed5354c7
+  1 changesets pruned
+  $ hg rebase -d 18 -r 16 --keep
+  rebasing 16:a438c045eb37 "add cN"
+  $ hg log -r 14:: -G
+  o  19:104eed5354c7 add cN
+  |
+  @  18:210589181b14 add cM
+  |
+  | o  16:a438c045eb37 add cN
+  | |
+  | o  15:2d66e189f5b5 add cM
+  |/
+  o  14:d66ccb8c5871 add cL
+  |
+  $ hg prune -r 104eed5354c7
+  1 changesets pruned