Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
update: check for missing files with --check (issue3595) stable
authorMatt Mackall <mpm@selenic.com>
Mon, 22 Oct 2012 17:23:31 -0500
branchstable
changeset 17849 6da47b655d97
parent 17848 66f0c78350ab
child 17850 71c1513fd560
update: check for missing files with --check (issue3595)
mercurial/commands.py file | annotate | diff | comparison | revisions
tests/test-merge5.t file | annotate | diff | comparison | revisions 
--- a/mercurial/commands.py	Mon Oct 22 16:06:47 2012 -0500
+++ b/mercurial/commands.py	Mon Oct 22 17:23:31 2012 -0500
@@ -5894,7 +5894,7 @@
 
     if check:
         c = repo[None]
-        if c.dirty(merge=False, branch=False):
+        if c.dirty(merge=False, branch=False, missing=True):
             raise util.Abort(_("uncommitted local changes"))
         if rev is None:
             rev = repo[repo[None].branch()].rev()
--- a/tests/test-merge5.t	Mon Oct 22 16:06:47 2012 -0500
+++ b/tests/test-merge5.t	Mon Oct 22 17:23:31 2012 -0500
@@ -16,6 +16,11 @@
   $ hg update
   abort: crosses branches (merge branches or update --check to force update)
   [255]
+  $ rm b
+  $ hg update -c
+  abort: uncommitted local changes
+  [255]
+  $ hg revert b
   $ hg update -c
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ mv a c
mercurial