Patchwork [4,of,4,V2] test-commit: stabilize for filesystems without symlink support

login
register
mail settings
Submitter Matt Harbison
Date July 19, 2017, 2:16 a.m.
Message ID <db9471e771042454674f.1500430610@Envy>
Download mbox | patch
Permalink /patch/22522/
State Accepted
Headers show

Comments

Matt Harbison - July 19, 2017, 2:16 a.m.
# HG changeset patch
# User Matt Harbison <matt_harbison@yahoo.com>
# Date 1500424462 14400
#      Tue Jul 18 20:34:22 2017 -0400
# Node ID db9471e771042454674f4535cb51228d5f6c0a5a
# Parent  ef6f06aee9e83554b4c0e80dcf961d7e8aec712a
test-commit: stabilize for filesystems without symlink support

Patch

diff --git a/tests/test-commit.t b/tests/test-commit.t
--- a/tests/test-commit.t
+++ b/tests/test-commit.t
@@ -103,6 +103,7 @@ 
   $ hg commit -m commit-15 baz
   abort: baz: file not tracked!
   [255]
+  $ rm baz
 #endif
 
   $ touch quux
@@ -129,18 +130,16 @@ 
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "commitextras=" >> $HGRCPATH
   $ hg status
-  ? baz
   ? quux
-  $ hg add baz
+  $ hg add quux
+  $ hg commit -m "adding internal used extras" --extra amend_source=hash
+  abort: key 'amend_source' is used internally, can't be set manually
+  [255]
   $ hg commit -m "adding extras" --extra sourcehash=foo --extra oldhash=bar
   $ hg log -r . -T '{extras % "{extra}\n"}'
   branch=default
   oldhash=bar
   sourcehash=foo
-  $ hg add quux
-  $ hg commit -m "adding internal used extras" --extra amend_source=hash
-  abort: key 'amend_source' is used internally, can't be set manually
-  [255]
 
 Make sure we do not obscure unknown requires file entries (issue2649)