Mercurial > public > mercurial-scm > hg

diff tests/test-update-names.t @ 39196:8c6775e812d8 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: do not delete untracked files silently (issue5962) 37450a122128, 2a774cae3a03, and 656ac240f392 weren't enough to prevent data loss. No unknown "files" weren't deleted before 7a8a16f8ea22, "context: also consider path conflicts when clearing unknown files."
author Yuya Nishihara <yuya@tcha.org>
date Sun, 19 Aug 2018 13:27:02 +0900
parents 2a774cae3a03
children c4a7ba10cdd7
line wrap: on
line diff
--- a/tests/test-update-names.t	Sat Aug 18 10:33:03 2018 +0900
+++ b/tests/test-update-names.t	Sun Aug 19 13:27:02 2018 +0900
@@ -50,7 +50,10 @@
   $ hg st
   ? name/file
   $ hg up 1
-  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  abort: Directory not empty: '$TESTTMP/r1/r2/name'
+  [255]
+  $ cat name/file
+  text
   $ cd ..
 
 #if symlink