Mercurial > hg

diff tests/test-symlinks.t @ 51163:b8f9911c8dca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
add: don't attempt to add back removed files unless explicitly listed This fixes the bug demonstrated by the previous patch.
author Martin von Zweigbergk <martinvonz@google.com>
date Wed, 29 Nov 2023 08:32:24 -0800
parents b0a6084f9cd6
children
line wrap: on
line diff
--- a/tests/test-symlinks.t	Tue Nov 28 22:44:04 2023 -0800
+++ b/tests/test-symlinks.t	Wed Nov 29 08:32:24 2023 -0800
@@ -210,14 +210,10 @@
 
   $ hg add -I foo
   adding foo
-  adding foo/a (known-bad-output !)
-  abort: file 'foo' in dirstate clashes with 'foo/a' (known-bad-output !)
-  [255]
   $ hg status
   A bar/a
-  A foo (missing-correct-output !)
+  A foo
   R foo/a
-  ? foo (known-bad-output !)
 
   $ cd ..