test-conflict.t
200 lines
| 3.6 KiB
| text/troff
|
Tads3Lexer
/ tests / test-conflict.t
|
r11797 | $ hg init | ||
|
r21920 | $ cat << EOF > a | ||
> Small Mathematical Series. | ||||
> One | ||||
> Two | ||||
> Three | ||||
> Four | ||||
> Five | ||||
> Hop we are done. | ||||
> EOF | ||||
|
r11797 | $ hg add a | ||
|
r12156 | $ hg commit -m ancestor | ||
|
r21920 | $ cat << EOF > a | ||
> Small Mathematical Series. | ||||
> 1 | ||||
> 2 | ||||
> 3 | ||||
> 4 | ||||
> 5 | ||||
> Hop we are done. | ||||
> EOF | ||||
|
r12156 | $ hg commit -m branch1 | ||
|
r11797 | $ hg co 0 | ||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
|
r21920 | $ cat << EOF > a | ||
> Small Mathematical Series. | ||||
> 1 | ||||
> 2 | ||||
> 3 | ||||
> 6 | ||||
> 8 | ||||
> Hop we are done. | ||||
> EOF | ||||
|
r12156 | $ hg commit -m branch2 | ||
|
r11797 | created new head | ||
$ hg merge 1 | ||||
merging a | ||||
warning: conflicts during merge. | ||||
|
r15501 | merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r11797 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | ||
|
r12314 | use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon | ||
|
r12316 | [1] | ||
|
r11797 | |||
$ hg id | ||||
|
r21920 | 618808747361+c0c68e4fe667+ tip | ||
|
r11797 | |||
$ cat a | ||||
|
r21920 | Small Mathematical Series. | ||
|
r21921 | <<<<<<< local: 618808747361 - test: branch2 | ||
|
r21920 | 1 | ||
2 | ||||
3 | ||||
6 | ||||
8 | ||||
|
r21519 | ======= | ||
|
r21921 | 1 | ||
2 | ||||
3 | ||||
|
r21920 | 4 | ||
5 | ||||
>>>>>>> other: c0c68e4fe667 - test: branch1 | ||||
Hop we are done. | ||||
|
r21519 | |||
$ hg status | ||||
M a | ||||
? a.orig | ||||
Verify custom conflict markers | ||||
$ hg up -q --clean . | ||||
$ printf "\n[ui]\nmergemarkertemplate={author} {rev}\n" >> .hg/hgrc | ||||
$ hg merge 1 | ||||
merging a | ||||
warning: conflicts during merge. | ||||
merging a incomplete! (edit conflicts, 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 update -C .' to abandon | ||||
[1] | ||||
$ cat a | ||||
|
r21920 | Small Mathematical Series. | ||
|
r21921 | <<<<<<< local: test 2 | ||
|
r21920 | 1 | ||
2 | ||||
3 | ||||
6 | ||||
8 | ||||
|
r21519 | ======= | ||
|
r21921 | 1 | ||
2 | ||||
3 | ||||
|
r21920 | 4 | ||
5 | ||||
|
r21519 | >>>>>>> other: test 1 | ||
|
r21920 | Hop we are done. | ||
|
r21519 | |||
|
r21864 | Verify line splitting of custom conflict marker which causes multiple lines | ||
$ hg up -q --clean . | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [ui] | ||||
> mergemarkertemplate={author} {rev}\nfoo\nbar\nbaz | ||||
> EOF | ||||
$ hg -q merge 1 | ||||
warning: conflicts during merge. | ||||
merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | ||||
[1] | ||||
$ cat a | ||||
|
r21920 | Small Mathematical Series. | ||
|
r21921 | <<<<<<< local: test 2 | ||
|
r21920 | 1 | ||
2 | ||||
3 | ||||
6 | ||||
8 | ||||
|
r21864 | ======= | ||
|
r21921 | 1 | ||
2 | ||||
3 | ||||
|
r21920 | 4 | ||
5 | ||||
|
r21864 | >>>>>>> other: test 1 | ||
|
r21920 | Hop we are done. | ||
|
r21864 | |||
|
r21865 | Verify line trimming of custom conflict marker using multi-byte characters | ||
$ hg up -q --clean . | ||||
$ python <<EOF | ||||
> fp = open('logfile', 'w') | ||||
> fp.write('12345678901234567890123456789012345678901234567890' + | ||||
> '1234567890') # there are 5 more columns for 80 columns | ||||
> | ||||
> # 2 x 4 = 8 columns, but 3 x 4 = 12 bytes | ||||
> fp.write(u'\u3042\u3044\u3046\u3048'.encode('utf-8')) | ||||
> | ||||
> fp.close() | ||||
> EOF | ||||
$ hg add logfile | ||||
$ hg --encoding utf-8 commit --logfile logfile | ||||
$ cat >> .hg/hgrc <<EOF | ||||
> [ui] | ||||
> mergemarkertemplate={desc|firstline} | ||||
> EOF | ||||
$ hg -q --encoding utf-8 merge 1 | ||||
warning: conflicts during merge. | ||||
merging a incomplete! (edit conflicts, then use 'hg resolve --mark') | ||||
[1] | ||||
$ cat a | ||||
|
r21920 | Small Mathematical Series. | ||
|
r21921 | <<<<<<< local: 123456789012345678901234567890123456789012345678901234567890\xe3\x81\x82... (esc) | ||
|
r21920 | 1 | ||
2 | ||||
3 | ||||
6 | ||||
8 | ||||
|
r21865 | ======= | ||
|
r21921 | 1 | ||
2 | ||||
3 | ||||
|
r21920 | 4 | ||
5 | ||||
|
r21865 | >>>>>>> other: branch1 | ||
|
r21920 | Hop we are done. | ||
|
r21865 | |||
|
r21519 | Verify basic conflict markers | ||
|
r21865 | $ hg up -q --clean 2 | ||
|
r21519 | $ printf "\n[ui]\nmergemarkers=basic\n" >> .hg/hgrc | ||
$ hg merge 1 | ||||
merging a | ||||
warning: conflicts during merge. | ||||
merging a incomplete! (edit conflicts, 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 update -C .' to abandon | ||||
[1] | ||||
$ cat a | ||||
|
r21920 | Small Mathematical Series. | ||
|
r21921 | <<<<<<< local | ||
|
r21920 | 1 | ||
2 | ||||
3 | ||||
6 | ||||
8 | ||||
|
r11797 | ======= | ||
|
r21921 | 1 | ||
2 | ||||
3 | ||||
|
r21920 | 4 | ||
5 | ||||
|
r11797 | >>>>>>> other | ||
|
r21920 | Hop we are done. | ||