test-merge-revert
44 lines
| 612 B
| text/plain
|
TextLexer
/ tests / test-merge-revert
|
r800 | #!/bin/sh | ||
|
r792 | |||
mkdir t | ||||
cd t | ||||
hg init | ||||
echo "added file1" > file1 | ||||
echo "added file2" > file2 | ||||
hg add file1 file2 | ||||
|
r1933 | hg commit -m "added file1 and file2" -d "1000000 0" -u user | ||
|
r792 | echo "changed file1" >> file1 | ||
|
r1933 | hg commit -m "changed file1" -d "1000000 0" -u user | ||
|
r792 | hg -q log | ||
hg id | ||||
hg update -C 0 | ||||
hg id | ||||
echo "changed file1" >> file1 | ||||
hg id | ||||
|
r2982 | hg revert --all | ||
|
r792 | hg diff | ||
hg status | ||||
hg id | ||||
hg update | ||||
hg diff | ||||
hg status | ||||
hg id | ||||
hg update -C 0 | ||||
echo "changed file1" >> file1 | ||||
HGMERGE=merge hg update | ||||
hg diff | ||||
hg status | ||||
hg id | ||||
|
r2982 | hg revert --all | ||
|
r792 | hg diff | ||
hg status | ||||
hg id | ||||
|
r2982 | hg revert -r tip --all | ||
|
r792 | hg diff | ||
hg status | ||||
hg id | ||||
hg update -C | ||||
hg diff | ||||
hg status | ||||
hg id | ||||