Mercurial > public > mercurial-scm > hg
diff mercurial/commands.py @ 19801:41abe2e3e3b7
update: standardize error message for dirty update --check
This and following patches will standardize the error message for dirty working
directories to "uncommitted changes".
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 23 Sep 2013 20:33:02 -0700 |
| parents | a9abdb168425 |
| children | 681f7b9213a4 |
line wrap: on
line diff
--- a/mercurial/commands.py Mon Sep 23 20:08:52 2013 -0700 +++ b/mercurial/commands.py Mon Sep 23 20:33:02 2013 -0700 @@ -5850,7 +5850,7 @@ if check: c = repo[None] if c.dirty(merge=False, branch=False, missing=True): - raise util.Abort(_("uncommitted local changes")) + raise util.Abort(_("uncommitted changes")) if rev is None: rev = repo[repo[None].branch()].rev() mergemod._checkunknown(repo, repo[None], repo[rev])