Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
| 19800:4894e0d9462d | 19801:41abe2e3e3b7 |
|---|---|
| 667 * = don't-care | 667 * = don't-care |
| 668 1 = abort: not a linear update (merge or update --check to force update) | 668 1 = abort: not a linear update (merge or update --check to force update) |
| 669 2 = abort: uncommitted changes (commit and merge, or update --clean to | 669 2 = abort: uncommitted changes (commit and merge, or update --clean to |
| 670 discard changes) | 670 discard changes) |
| 671 3 = abort: uncommitted changes (commit or update --clean to discard changes) | 671 3 = abort: uncommitted changes (commit or update --clean to discard changes) |
| 672 4 = abort: uncommitted local changes | 672 4 = abort: uncommitted changes (checked in commands.py) |
| 673 5 = incompatible options (checked in commands.py) | 673 5 = incompatible options (checked in commands.py) |
| 674 | 674 |
| 675 Return the same tuple as applyupdates(). | 675 Return the same tuple as applyupdates(). |
| 676 """ | 676 """ |
| 677 | 677 |