test-merge7
66 lines
| 869 B
| text/plain
|
TextLexer
/ tests / test-merge7
|
r1351 | #!/bin/sh | ||
# initial | ||||
hg init test-a | ||||
cd test-a | ||||
cat >test.txt <<"EOF" | ||||
1 | ||||
2 | ||||
3 | ||||
EOF | ||||
hg add test.txt | ||||
hg commit -m "Initial" -d "0 0" | ||||
# clone | ||||
cd .. | ||||
hg clone test-a test-b | ||||
# change test-a | ||||
cd test-a | ||||
cat >test.txt <<"EOF" | ||||
one | ||||
two | ||||
three | ||||
EOF | ||||
hg commit -m "Numbers as words" -d "0 0" | ||||
# change test-b | ||||
cd ../test-b | ||||
cat >test.txt <<"EOF" | ||||
1 | ||||
2.5 | ||||
3 | ||||
EOF | ||||
hg commit -m "2 -> 2.5" -d "0 0" | ||||
# now pull and merge from test-a | ||||
|
r1352 | hg pull ../test-a | ||
|
r1351 | HGMERGE=merge hg update -m | ||
# resolve conflict | ||||
cat >test.txt <<"EOF" | ||||
one | ||||
two-point-five | ||||
three | ||||
EOF | ||||
rm -f *.orig | ||||
hg commit -m "Merge 1" -d "0 0" | ||||
# change test-a again | ||||
cd ../test-a | ||||
cat >test.txt <<"EOF" | ||||
one | ||||
two-point-one | ||||
three | ||||
EOF | ||||
|
r1352 | hg commit -m "two -> two-point-one" -d "0 0" | ||
|
r1351 | |||
# pull and merge from test-a again | ||||
cd ../test-b | ||||
|
r1352 | hg pull ../test-a | ||
|
r1351 | HGMERGE=merge hg update --debug -m | ||
|
r1352 | cat test.txt | sed "s% .*%%" | ||
|
r1351 | |||
hg debugindex .hg/data/test.txt.i | ||||
hg log | ||||