tests/test-touch.t
branchstable
changeset 4728 ef8907df73fc
parent 4727 355b8e17e14c
child 4729 076b6813a7ea
child 4772 c6fc1000af1e
--- a/tests/test-touch.t	Sat Jun 29 14:28:35 2019 +0530
+++ b/tests/test-touch.t	Wed Jul 17 17:58:44 2019 +0200
@@ -186,7 +186,9 @@
 
   $ hg touch -r "desc('added c')" --hidden
   $ hg touch -r "desc('modified c')" --hidden
+  [1] modified c
+  reviving this changeset will create divergence unless you make a duplicate.
+  (a)llow divergence or (d)uplicate the changeset?  a
   2 new content-divergent changesets
-XXX: it should warn for divergence here
 
   $ cd ..