--- a/tests/test-touch.t Mon Jul 15 16:53:07 2019 -0700
+++ b/tests/test-touch.t Wed Jul 17 18:06:14 2019 +0200
@@ -200,3 +200,25 @@
$ hg st --change 17
A a
A b
+
+ $ cd ..
+
+Make sure touch doesn't fail to warn about divergence (issue6107)
+
+ $ hg init touchdiv
+ $ cd touchdiv
+ $ echo c > c
+ $ hg add c
+ $ hg ci -m "added c"
+
+ $ hg amend -m "modified c"
+ $ hg prune . -q
+
+ $ 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
+
+ $ cd ..