##// END OF EJS Templates
update: check for missing files with --check (issue3595)
Matt Mackall -
r17849:6da47b65 stable
parent child Browse files
Show More
@@ -5894,7 +5894,7 b' def update(ui, repo, node=None, rev=None'
5894
5894
5895 if check:
5895 if check:
5896 c = repo[None]
5896 c = repo[None]
5897 if c.dirty(merge=False, branch=False):
5897 if c.dirty(merge=False, branch=False, missing=True):
5898 raise util.Abort(_("uncommitted local changes"))
5898 raise util.Abort(_("uncommitted local changes"))
5899 if rev is None:
5899 if rev is None:
5900 rev = repo[repo[None].branch()].rev()
5900 rev = repo[repo[None].branch()].rev()
@@ -16,6 +16,11 b''
16 $ hg update
16 $ hg update
17 abort: crosses branches (merge branches or update --check to force update)
17 abort: crosses branches (merge branches or update --check to force update)
18 [255]
18 [255]
19 $ rm b
20 $ hg update -c
21 abort: uncommitted local changes
22 [255]
23 $ hg revert b
19 $ hg update -c
24 $ hg update -c
20 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
25 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
21 $ mv a c
26 $ mv a c
General Comments 0
You need to be logged in to leave comments. Login now