Mercurial > hg
comparison tests/test-merge-force.t @ 15619:6c8573dd1b6b
merge: make 'nothing to merge' aborts consistent
Makes the 'nothing to merge' abort messages in commands.py consistent with
those in merge.py. Also makes commands.merge() and merge.update() use hints.
The tests show the changes.
| author | Kevin Bullock <kbullock@ringworld.org> |
|---|---|
| date | Wed, 07 Dec 2011 11:23:01 -0600 |
| parents | 4134686b83e1 |
| children | 94c394653b2a |
comparison
equal
deleted
inserted
replaced
| 15618:0aca2695a110 | 15619:6c8573dd1b6b |
|---|---|
| 17 Local deleted a file, remote removed | 17 Local deleted a file, remote removed |
| 18 | 18 |
| 19 Should fail, since there are deleted files: | 19 Should fail, since there are deleted files: |
| 20 | 20 |
| 21 $ hg merge | 21 $ hg merge |
| 22 abort: outstanding uncommitted changes (use 'hg status' to list changes) | 22 abort: outstanding uncommitted changes |
| 23 (use 'hg status' to list changes) | |
| 23 [255] | 24 [255] |
| 24 | 25 |
| 25 Should succeed with --force: | 26 Should succeed with --force: |
| 26 | 27 |
| 27 $ hg -v merge --force | 28 $ hg -v merge --force |