Mercurial > hg > evolve

changeset 4832:355b8e17e14c stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
touch: add test which shows touch can fail to warn about divergence
author Sushil khanchi <sushilkhanchi97@gmail.com>
date Sat, 29 Jun 2019 14:28:35 +0530 (2019-06-29)
parents 24e83f51ffc2
children ef8907df73fc
files tests/test-touch.t
diffstat 1 files changed, 20 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-touch.t
+++ b/tests/test-touch.t
@@ -170,3 +170,23 @@
   (see 'hg help phases' for details)
   [255]
   $ hg touch --duplicate 2
+
+  $ 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
+  2 new content-divergent changesets
+XXX: it should warn for divergence here
+
+  $ cd ..