tests/test-touch.t
branchmercurial-3.5
changeset 1606 c2739551ea4e
parent 1589 d6630a6bff86
child 1762 ad04f3c3b1a9
--- a/tests/test-touch.t	Thu Feb 04 11:07:44 2016 +0000
+++ b/tests/test-touch.t	Thu Feb 11 00:07:54 2016 +0000
@@ -41,6 +41,9 @@
   @  1:[0-9a-f]{12} a (re)
   
   $ hg touch .
+  [1] a
+  reviving this changeset will create divergence unless you make a duplicate.
+  (a)llow divergence or (d)uplicate the changeset? a
   2 new divergent changesets
   $ hg log -G
   @  4:[0-9a-f]{12} a (re)
@@ -110,3 +113,15 @@
   A gna2
     gna1
   R gna1
+
+check that the --duplicate option does not create divergence
+
+  $ hg touch --duplicate 11 --hidden
+  1 new unstable changesets
+
+check that reviving a changeset with no successor does not show the prompt
+
+  $ hg prune 14
+  1 changesets pruned
+  $ hg touch 14 --hidden
+  1 new unstable changesets