##// END OF EJS Templates
tests: fix test-sparse-revlog...
tests: fix test-sparse-revlog This one is not covered by the CIbecause I requires an expensive artifact to be cached. So it goes out of think on regular basis (we should fix that…) The test ouput was affected by e706bb41fdb3 as we filtering now happens sooner, removing for the output.

File last commit:

r50516:55c6ebd1 stable
r50521:da636e7a default
Show More
test-merge4.t
59 lines | 1.8 KiB | text/troff | Tads3Lexer
Pradeepkumar Gayam
tests: unify test-merge4
r11977 $ hg init
$ echo This is file a1 > a
$ hg add a
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "commit #0"
Pradeepkumar Gayam
tests: unify test-merge4
r11977 $ echo This is file b1 > b
$ hg add b
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "commit #1"
Pradeepkumar Gayam
tests: unify test-merge4
r11977 $ hg update 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo This is file c1 > c
$ hg add c
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "commit #2"
Pradeepkumar Gayam
tests: unify test-merge4
r11977 created new head
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ rm b
$ echo This is file c22 > c
Patrick Mezard
commit: abort on merge with missing files...
r16536
Test hg behaves when committing with a missing file added by a merge
Martin Geisler
tests: remove unneeded -d flags...
r12156 $ hg commit -m "commit #3"
Patrick Mezard
commit: abort on merge with missing files...
r16536 abort: cannot commit merge with missing files
[255]
Pradeepkumar Gayam
tests: unify test-merge4
r11977
Martin von Zweigbergk
revset: add a revset for parents in merge state...
r44817
Test conflict*() revsets
# Bad usage
$ hg log -r 'conflictlocal(foo)'
hg: parse error: conflictlocal takes no arguments
Martin von Zweigbergk
errors: use exit code 10 for parse errors...
r46507 [10]
Martin von Zweigbergk
revset: add a revset for parents in merge state...
r44817 $ hg log -r 'conflictother(foo)'
hg: parse error: conflictother takes no arguments
Martin von Zweigbergk
errors: use exit code 10 for parse errors...
r46507 [10]
Martin von Zweigbergk
revset: add a revset for parents in merge state...
r44817 $ hg co -C .
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
# No merge parents when not merging
$ hg log -r 'conflictlocal() + conflictother()'
# No merge parents when there is no conflict
$ hg merge 1
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
$ hg log -r 'conflictlocal() + conflictother()'
$ hg co -C .
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ echo conflict > b
$ hg ci -Aqm 'conflicting change to b'
$ hg merge 1
merging b
warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
0 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
[1]
# Shows merge parents when there is a conflict
$ hg log -r 'conflictlocal()' -T '{rev} {desc}\n'
3 conflicting change to b
$ hg log -r 'conflictother()' -T '{rev} {desc}\n'
1 commit #1