# HG changeset patch # User Matt Mackall # Date 1350944611 18000 # Node ID 6da47b655d977aed78501b2cbc04cda11f240bcd # Parent 66f0c78350abc19d6a4eb3574b5a4ea601dfb45c update: check for missing files with --check (issue3595) diff -r 66f0c78350ab -r 6da47b655d97 mercurial/commands.py --- 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() diff -r 66f0c78350ab -r 6da47b655d97 tests/test-merge5.t --- 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