[PATCH 2 of 2] test-commit: move test requiring symlink to the end

Adrian Buehlmann adrian at cadifra.com
Thu May 31 09:06:04 CDT 2012


# HG changeset patch
# User Adrian Buehlmann <adrian at cadifra.com>
# Date 1338469397 -7200
# Node ID b16c22df608298617dc23e8f5546541a6ce22194
# Parent  ca1dcebca73680d1b874e51e7515b696c095a4a1
test-commit: move test requiring symlink to the end

Before, the whole testfile was untested on Windows. Now, only a small portion
is really skipped.

diff --git a/tests/test-commit.t b/tests/test-commit.t
--- a/tests/test-commit.t
+++ b/tests/test-commit.t
@@ -1,5 +1,3 @@
-  $ "$TESTDIR/hghave" symlink || exit 80
-
 commit date test
 
   $ hg init test
@@ -75,10 +73,6 @@
   $ hg commit -m commit-14 does-not-exist
   abort: does-not-exist: * (glob)
   [255]
-  $ ln -s foo baz
-  $ hg commit -m commit-15 baz
-  abort: baz: file not tracked!
-  [255]
   $ touch quux
   $ hg commit -m commit-16 quux
   abort: quux: file not tracked!
@@ -220,7 +214,6 @@
 
 Issue1049: Hg permits partial commit of merge without warning
 
-  $ cd ..
   $ hg init issue1049
   $ cd issue1049
   $ echo a > a
@@ -281,3 +274,18 @@
   HG: removed removed
   abort: empty commit message
   [255]
+  $ cd ..
+
+  $ "$TESTDIR/hghave" symlink || exit 80
+
+  $ pwd
+  $TESTTMP
+  $ hg init symlinktest
+  $ cd symlinktest
+  $ echo foo > foo
+  $ hg ci -qAm c1
+  $ ln -s foo baz
+  $ hg ci -m c2 baz
+  abort: baz: file not tracked!
+  [255]
+  $ cd ..


More information about the Mercurial-devel mailing list