test-merge7.t
148 lines
| 3.9 KiB
| text/troff
|
Tads3Lexer
/ tests / test-merge7.t
|
r11980 | initial | ||
$ hg init test-a | ||||
$ cd test-a | ||||
$ cat >test.txt <<"EOF" | ||||
> 1 | ||||
> 2 | ||||
> 3 | ||||
> EOF | ||||
$ hg add test.txt | ||||
|
r12156 | $ hg commit -m "Initial" | ||
|
r11980 | |||
clone | ||||
$ cd .. | ||||
$ hg clone test-a test-b | ||||
updating to branch default | ||||
1 files updated, 0 files merged, 0 files removed, 0 files unresolved | ||||
change test-a | ||||
$ cd test-a | ||||
$ cat >test.txt <<"EOF" | ||||
> one | ||||
> two | ||||
> three | ||||
> EOF | ||||
|
r12156 | $ hg commit -m "Numbers as words" | ||
|
r11980 | |||
change test-b | ||||
$ cd ../test-b | ||||
$ cat >test.txt <<"EOF" | ||||
> 1 | ||||
> 2.5 | ||||
> 3 | ||||
> EOF | ||||
|
r12156 | $ hg commit -m "2 -> 2.5" | ||
|
r11980 | |||
now pull and merge from test-a | ||||
$ hg pull ../test-a | ||||
pulling from ../test-a | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
$ hg merge | ||||
merging test.txt | ||||
warning: conflicts during merge. | ||||
|
r15501 | merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r11980 | 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] | ||
|
r11980 | resolve conflict | ||
$ cat >test.txt <<"EOF" | ||||
> one | ||||
> two-point-five | ||||
> three | ||||
> EOF | ||||
$ rm -f *.orig | ||||
$ hg resolve -m test.txt | ||||
|
r21267 | no more unresolved files | ||
|
r12156 | $ hg commit -m "Merge 1" | ||
|
r11980 | |||
change test-a again | ||||
$ cd ../test-a | ||||
$ cat >test.txt <<"EOF" | ||||
> one | ||||
> two-point-one | ||||
> three | ||||
> EOF | ||||
|
r12156 | $ hg commit -m "two -> two-point-one" | ||
|
r11980 | |||
pull and merge from test-a again | ||||
$ cd ../test-b | ||||
$ hg pull ../test-a | ||||
pulling from ../test-a | ||||
searching for changes | ||||
adding changesets | ||||
adding manifests | ||||
adding file changes | ||||
added 1 changesets with 1 changes to 1 files (+1 heads) | ||||
(run 'hg heads' to see heads, 'hg merge' to merge) | ||||
$ hg merge --debug | ||||
searching for copies back to rev 1 | ||||
resolving manifests | ||||
|
r18605 | branchmerge: True, force: False, partial: False | ||
|
r15625 | ancestor: 96b70246a118, local: 50c3a7e29886+, remote: 40d11a4173a8 | ||
|
r21391 | preserving test.txt for resolve of test.txt | ||
|
r11980 | test.txt: versions differ -> m | ||
updating: test.txt 1/1 files (100.00%) | ||||
picked tool 'internal:merge' for test.txt (binary False symlink False) | ||||
merging test.txt | ||||
|
r12156 | my test.txt@50c3a7e29886+ other test.txt@40d11a4173a8 ancestor test.txt@96b70246a118 | ||
|
r11980 | warning: conflicts during merge. | ||
|
r15501 | merging test.txt incomplete! (edit conflicts, then use 'hg resolve --mark') | ||
|
r11980 | 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] | ||
|
r11980 | |||
$ cat test.txt | ||||
one | ||||
|
r21693 | <<<<<<< local: 50c3a7e29886 - test: Merge 1 | ||
|
r11980 | two-point-five | ||
======= | ||||
two-point-one | ||||
|
r21693 | >>>>>>> other: 40d11a4173a8 - test: two -> two-point-one | ||
|
r11980 | three | ||
|
r14182 | $ hg debugindex test.txt | ||
|
r17132 | rev offset length ..... linkrev nodeid p1 p2 (re) | ||
0 0 7 ..... 0 01365c4cca56 000000000000 000000000000 (re) | ||||
1 7 9 ..... 1 7b013192566a 01365c4cca56 000000000000 (re) | ||||
2 16 15 ..... 2 8fe46a3eb557 01365c4cca56 000000000000 (re) | ||||
3 31 2. ..... 3 fc3148072371 7b013192566a 8fe46a3eb557 (re) | ||||
4 5. 25 ..... 4 d40249267ae3 8fe46a3eb557 000000000000 (re) | ||||
|
r11980 | |||
$ hg log | ||||
|
r12156 | changeset: 4:40d11a4173a8 | ||
|
r11980 | tag: tip | ||
|
r12156 | parent: 2:96b70246a118 | ||
|
r11980 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11980 | summary: two -> two-point-one | ||
|
r12156 | changeset: 3:50c3a7e29886 | ||
parent: 1:d1e159716d41 | ||||
parent: 2:96b70246a118 | ||||
|
r11980 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11980 | summary: Merge 1 | ||
|
r12156 | changeset: 2:96b70246a118 | ||
parent: 0:b1832b9d912a | ||||
|
r11980 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11980 | summary: Numbers as words | ||
|
r12156 | changeset: 1:d1e159716d41 | ||
|
r11980 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11980 | summary: 2 -> 2.5 | ||
|
r12156 | changeset: 0:b1832b9d912a | ||
|
r11980 | user: test | ||
|
r12156 | date: Thu Jan 01 00:00:00 1970 +0000 | ||
|
r11980 | summary: Initial | ||
|
r16913 | |||
$ cd .. | ||||