test-merge-revert2
47 lines
| 800 B
| text/plain
|
TextLexer
/ tests / test-merge-revert2
|
r800 | #!/bin/sh | ||
|
r792 | |||
mkdir t | ||||
cd t | ||||
hg init | ||||
echo "added file1" > file1 | ||||
|
r864 | echo "another line of text" >> file1 | ||
|
r792 | echo "added file2" > file2 | ||
hg add file1 file2 | ||||
hg commit -m "added file1 and file2" -d "0 0" -u user | ||||
echo "changed file1" >> file1 | ||||
hg commit -m "changed file1" -d "0 0" -u user | ||||
hg -q log | ||||
hg id | ||||
hg update -C 0 | ||||
hg id | ||||
echo "changed file1" >> file1 | ||||
hg id | ||||
hg revert | ||||
hg diff | ||||
hg status | ||||
hg id | ||||
hg update | ||||
hg diff | ||||
hg status | ||||
hg id | ||||
hg update -C 0 | ||||
echo "changed file1 different" >> file1 | ||||
HGMERGE=merge hg update | ||||
|
r949 | hg diff | sed -e "s/\(+++ [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\) .*/\1/" \ | ||
-e "s/\(--- [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(>>>>>>>\) .*/\1/" | ||||
|
r792 | hg status | ||
hg id | ||||
hg revert | ||||
hg diff | ||||
hg status | ||||
hg id | ||||
hg revert -r tip | ||||
hg diff | ||||
hg status | ||||
hg id | ||||
hg update -C | ||||
hg diff | ||||
hg status | ||||
hg id | ||||
cd ..; /bin/rm -rf t | ||||