Mercurial > public > mercurial-scm > hg-stable
diff mercurial/merge.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 | 4894e0d9462d |
| children | 94c394653b2a |
line wrap: on
line diff
--- a/mercurial/merge.py Mon Sep 23 20:08:52 2013 -0700 +++ b/mercurial/merge.py Mon Sep 23 20:33:02 2013 -0700 @@ -669,7 +669,7 @@ 2 = abort: uncommitted changes (commit and merge, or update --clean to discard changes) 3 = abort: uncommitted changes (commit or update --clean to discard changes) - 4 = abort: uncommitted local changes + 4 = abort: uncommitted changes (checked in commands.py) 5 = incompatible options (checked in commands.py) Return the same tuple as applyupdates().