# HG changeset patch
# User Adrian Buehlmann <adrian@cadifra.com>
# Date 1281889529 -7200
# Node ID 2bd699886ffc6048825e4bfd8cf05271ba7b2b69
# Parent  76818b28ce988898c34c041fc5416a04d9233c1d
tests: combine test-dirstate-future.t

into test-dirstate.t

diff -r 76818b28ce98 -r 2bd699886ffc tests/test-dirstate-future.t
--- a/tests/test-dirstate-future.t	Sun Aug 15 18:24:49 2010 +0200
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-Prepare test repo:
-
-  $ hg init
-  $ echo a > a
-  $ hg add
-  adding a
-  $ hg ci -m1
-
-Set mtime of a into the future:
-
-  $ touch -t 202101011200 a
-
-Status must not set a's entry to unset (issue1790):
-
-  $ hg status
-  $ hg debugstate
-  n 644          2 2021-01-01 12:00:00 a
-
diff -r 76818b28ce98 -r 2bd699886ffc tests/test-dirstate.t
--- a/tests/test-dirstate.t	Sun Aug 15 18:24:49 2010 +0200
+++ b/tests/test-dirstate.t	Sun Aug 15 18:25:29 2010 +0200
@@ -1,4 +1,4 @@
-Test dirstate._dirs refcounting:
+------ Test dirstate._dirs refcounting
 
   $ hg init t
   $ cd t
@@ -14,4 +14,27 @@
   moving a/b/c/d/x to z/b/c/d/x
   moving a/b/c/d/y to z/b/c/d/y
   moving a/b/c/d/z to z/b/c/d/z
+  $ cd ..
 
+------ issue1790
+
+Prepare test repo:
+
+  $ hg init u
+  $ cd u
+  $ echo a > a
+  $ hg add
+  adding a
+  $ hg ci -m1
+
+Set mtime of a into the future:
+
+  $ touch -t 202101011200 a
+
+Status must not set a's entry to unset (issue1790):
+
+  $ hg status
+  $ hg debugstate
+  n 644          2 2021-01-01 12:00:00 a
+  $ cd ..
+