##// END OF EJS Templates
localrepo: use single quotes in use warning
localrepo: use single quotes in use warning

File last commit:

r29975:c15f0610 default
r29975:c15f0610 default
Show More
test-commit-unresolved.t
67 lines | 1.6 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
Siddharth Agarwal
simplemerge: move conflict warning message to filemerge...
r26614 warning: conflicts while merging A! (edit, 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"
timeless
localrepo: use single quotes in use warning
r29975 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
Siddharth Agarwal
localrepo.commit: check all files for resolve state (issue4972)...
r27102 Test that if a file is removed but not marked resolved, the commit still fails
(issue4972)
$ hg up ".^"
1 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ hg merge 2
merging A
warning: conflicts while merging A! (edit, then use 'hg resolve --mark')
1 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]
$ hg rm --force A
$ hg commit -m merged
timeless
localrepo: use single quotes in use warning
r29975 abort: unresolved merge conflicts (see 'hg help resolve')
Siddharth Agarwal
localrepo.commit: check all files for resolve state (issue4972)...
r27102 [255]
$ hg resolve -ma
(no more unresolved files)
$ hg commit -m merged
created new head
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913 $ cd ..