Mercurial > hg

diff tests/test-fix.t @ 42008:7f6b375a8903

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix: allow fixing untracked files when given as arguments It's more useful to fix the file than to silently avoid it when the user does this: hg fix --working-dir untracked-file We will still do nothing to ignored files, even if they are specified. This may be safer, given that such files can unexpectedly slip into the arguments via a shell glob or fileset. Differential Revision: https://phab.mercurial-scm.org/D6165
author Danny Hooper <hooper@google.com>
date Thu, 21 Mar 2019 18:35:39 -0700
parents d8f5c615e811
children 0da689a60163
line wrap: on
line diff
--- a/tests/test-fix.t	Tue Mar 19 16:26:52 2019 +0300
+++ b/tests/test-fix.t	Thu Mar 21 18:35:39 2019 -0700
@@ -354,6 +354,10 @@
 
   $ printf "modified!!!\n" > modified.whole
   $ printf "added\n" > added.whole
+
+Listing the files explicitly causes untracked files to also be fixed, but
+ignored files are still unaffected.
+
   $ hg fix --working-dir *.whole
 
   $ hg status --all
@@ -366,13 +370,12 @@
   I ignored.whole
   C .hgignore
 
-It would be better if this also fixed the unknown file.
   $ cat *.whole
   ADDED
   CLEAN
   ignored
   MODIFIED!!!
-  unknown
+  UNKNOWN
 
   $ cd ..