mirror of
https://github.com/facebook/sapling.git
synced 2024-10-07 23:38:50 +03:00
0cb0a7ba67
The recently introduced message was: no unresolved files; you may continue your unfinished operation This had three problems: - looks a bit like an error message because it's not saying "we've just resolved the last file" - refers to "unfinished operation", which won't be the case with "update" or "merge" - introduces semicolons to error messages, which is stylistically questionable I've simplified this to: no more unresolved files In the future, if we want to prompt someone to continue a particular operation, we should use a hint style: no more unresolved files (use 'hg graft --continue' to finish grafting)
61 lines
1.2 KiB
Perl
61 lines
1.2 KiB
Perl
test that a commit clears the merge state.
|
|
|
|
$ hg init repo
|
|
$ cd repo
|
|
|
|
$ echo foo > file
|
|
$ hg commit -Am 'add file'
|
|
adding file
|
|
|
|
$ echo bar >> file
|
|
$ hg commit -Am 'append bar'
|
|
|
|
|
|
create a second head
|
|
|
|
$ hg up -C 0
|
|
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
|
|
$ echo baz >> file
|
|
$ hg commit -Am 'append baz'
|
|
created new head
|
|
|
|
failing merge
|
|
|
|
$ hg merge --tool=internal:fail
|
|
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
|
|
use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
|
|
[1]
|
|
|
|
resolve -l should contain an unresolved entry
|
|
|
|
$ hg resolve -l
|
|
U file
|
|
|
|
resolving an unknown path emits a warning
|
|
$ hg resolve -m does-not-exist
|
|
arguments do not match paths that need resolved
|
|
|
|
resolve the failure
|
|
|
|
$ echo resolved > file
|
|
$ hg resolve -m file
|
|
no more unresolved files
|
|
$ hg commit -m 'resolved'
|
|
|
|
resolve -l should error since no merge in progress
|
|
|
|
$ hg resolve -l
|
|
abort: resolve command not applicable when not merging
|
|
[255]
|
|
|
|
test crashed merge with empty mergestate
|
|
|
|
$ mkdir .hg/merge
|
|
$ touch .hg/merge/state
|
|
|
|
resolve -l, should be empty
|
|
|
|
$ hg resolve -l
|
|
|
|
$ cd ..
|