test-merge2
48 lines
| 802 B
| text/plain
|
TextLexer
/ tests / test-merge2
|
r800 | #!/bin/sh | ||
|
r409 | |||
mkdir t | ||||
cd t | ||||
hg init | ||||
echo This is file a1 > a | ||||
hg add a | ||||
|
r749 | hg commit -m "commit #0" -d "0 0" | ||
|
r409 | echo This is file b1 > b | ||
hg add b | ||||
|
r749 | hg commit -m "commit #1" -d "0 0" | ||
|
r409 | rm b | ||
hg update 0 | ||||
echo This is file b2 > b | ||||
hg add b | ||||
|
r749 | hg commit -m "commit #2" -d "0 0" | ||
|
r409 | cd ..; /bin/rm -rf t | ||
mkdir t | ||||
cd t | ||||
hg init | ||||
echo This is file a1 > a | ||||
hg add a | ||||
|
r749 | hg commit -m "commit #0" -d "0 0" | ||
|
r409 | echo This is file b1 > b | ||
hg add b | ||||
|
r749 | hg commit -m "commit #1" -d "0 0" | ||
|
r409 | rm b | ||
hg update 0 | ||||
echo This is file b2 > b | ||||
|
r749 | hg commit -A -m "commit #2" -d "0 0" | ||
|
r409 | cd ..; /bin/rm -rf t | ||
mkdir t | ||||
cd t | ||||
hg init | ||||
echo This is file a1 > a | ||||
hg add a | ||||
|
r749 | hg commit -m "commit #0" -d "0 0" | ||
|
r409 | echo This is file b1 > b | ||
hg add b | ||||
|
r749 | hg commit -m "commit #1" -d "0 0" | ||
|
r409 | rm b | ||
hg remove b | ||||
hg update 0 | ||||
echo This is file b2 > b | ||||
|
r749 | hg commit -A -m "commit #2" -d "0 0" | ||
|
r409 | cd ..; /bin/rm -rf t | ||