##// END OF EJS Templates
test-revset: add tests for missing function output...
test-revset: add tests for missing function output An upcoming change will slightly alter behavior here. Adding the test now so the output change stands out in the later changeset.

File last commit:

r23917:3cbb5bf4 default
r24220:fe195d41 default
Show More
test-commit-unresolved.t
47 lines | 1.0 KiB | text/troff | Tads3Lexer
/ tests / test-commit-unresolved.t
Nicolas Dumazet
tests: unify test-commit-unresolved
r11804 $ addcommit () {
> echo $1 > $1
> hg add $1
> hg commit -d "${2} 0" -m $1
> }
$ commit () {
> hg commit -d "${2} 0" -m $1
> }
$ hg init a
$ cd a
$ addcommit "A" 0
$ addcommit "B" 1
$ echo "C" >> A
$ commit "C" 2
$ hg update -C 0
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo "D" >> A
$ commit "D" 3
created new head
Merging a conflict araises
$ hg merge
merging A
warning: conflicts during merge.
Matt Mackall
merge: give a special message for internal:merge failure (issue3105)
r15501 merging A incomplete! (edit conflicts, then use 'hg resolve --mark')
Nicolas Dumazet
tests: unify test-commit-unresolved
r11804 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
Brodie Rao
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...
r12314 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
Matt Mackall
tests: add exit codes to unified tests
r12316 [1]
Nicolas Dumazet
tests: unify test-commit-unresolved
r11804
Correct the conflict without marking the file as resolved
$ echo "ABCD" > A
$ hg commit -m "Merged"
Wagner Bruna
messages: quote "hg help" hints consistently
r23917 abort: unresolved merge conflicts (see "hg help resolve")
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Nicolas Dumazet
tests: unify test-commit-unresolved
r11804
Mark the conflict as resolved and commit
$ hg resolve -m A
Pierre-Yves David
resolve: add parenthesis around "no more unresolved files" message...
r21947 (no more unresolved files)
Nicolas Dumazet
tests: unify test-commit-unresolved
r11804 $ hg commit -m "Merged"
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..