Mercurial > hg
comparison tests/test-largefiles.t @ 22841:18b3869179f9
merge: make error message consistent with other commands
If a merge is attempted when another merge is already ongoing, we give
the message "outstanding uncommitted merges". Many other commands
(such as backout, rebase, histedit) give the same message in singular
form. Since the singular form also seems to make more sense, let's use
that for 'hg merge' as well.
| author | Martin von Zweigbergk <martinvonz@gmail.com> |
|---|---|
| date | Wed, 08 Oct 2014 14:16:53 -0700 |
| parents | 4e2559841d6c |
| children | 51c9196a6bd0 |
comparison
equal
deleted
inserted
replaced
| 22840:ba5c635921e1 | 22841:18b3869179f9 |
|---|---|
| 1703 M large | 1703 M large |
| 1704 | 1704 |
| 1705 - make sure update of merge with removed largefiles fails as expected | 1705 - make sure update of merge with removed largefiles fails as expected |
| 1706 $ hg rm sub2/large6 | 1706 $ hg rm sub2/large6 |
| 1707 $ hg up -r. | 1707 $ hg up -r. |
| 1708 abort: outstanding uncommitted merges | 1708 abort: outstanding uncommitted merge |
| 1709 [255] | 1709 [255] |
| 1710 | 1710 |
| 1711 - revert should be able to revert files introduced in a pending merge | 1711 - revert should be able to revert files introduced in a pending merge |
| 1712 $ hg revert --all -r . | 1712 $ hg revert --all -r . |
| 1713 removing .hglf/large (glob) | 1713 removing .hglf/large (glob) |