Mercurial > hg
comparison tests/test-confused-revert.t @ 14721:4fcde634f5e0 stable
revert: be more helpful on uncommitted merges
BEFORE:
$ hg revert
abort: no files or directories specified
(use --all to discard all changes)
AFTER:
$ hg revert
abort: no files or directories specified
(uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge)
| author | Adrian Buehlmann <adrian@cadifra.com> |
|---|---|
| date | Wed, 22 Jun 2011 15:34:33 +0200 |
| parents | 88a53081fb21 |
| children | a934b9249574 |
comparison
equal
deleted
inserted
replaced
| 14720:36283a7b6856 | 14721:4fcde634f5e0 |
|---|---|
| 58 | 58 |
| 59 Revert should fail: | 59 Revert should fail: |
| 60 | 60 |
| 61 $ hg revert | 61 $ hg revert |
| 62 abort: no files or directories specified | 62 abort: no files or directories specified |
| 63 (use --all to discard all changes) | 63 (uncommitted merge, use --all to discard all changes, or 'hg update -C .' to abort the merge) |
| 64 [255] | 64 [255] |
| 65 | 65 |
| 66 Revert should be ok now: | 66 Revert should be ok now: |
| 67 | 67 |
| 68 $ hg revert -r2 --all | 68 $ hg revert -r2 --all |