Mercurial > hg-stable
comparison tests/test-merge-revert2 @ 792:49ec802b4a16
Added tests for bug with three-way-merging of old tip, tip and cwd.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Sat, 23 Jul 2005 17:14:05 +0100 |
| parents | |
| children | ec85f9e6f3b1 |
comparison
equal
deleted
inserted
replaced
| 791:040655ea0cc4 | 792:49ec802b4a16 |
|---|---|
| 1 #!/bin/sh -x | |
| 2 | |
| 3 mkdir t | |
| 4 cd t | |
| 5 hg init | |
| 6 echo "added file1" > file1 | |
| 7 echo "added file2" > file2 | |
| 8 hg add file1 file2 | |
| 9 hg commit -m "added file1 and file2" -d "0 0" -u user | |
| 10 echo "changed file1" >> file1 | |
| 11 hg commit -m "changed file1" -d "0 0" -u user | |
| 12 hg -q log | |
| 13 hg id | |
| 14 hg update -C 0 | |
| 15 hg id | |
| 16 echo "changed file1" >> file1 | |
| 17 hg id | |
| 18 hg revert | |
| 19 hg diff | |
| 20 hg status | |
| 21 hg id | |
| 22 hg update | |
| 23 hg diff | |
| 24 hg status | |
| 25 hg id | |
| 26 hg update -C 0 | |
| 27 echo "changed file1 different" >> file1 | |
| 28 HGMERGE=merge hg update | |
| 29 hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" | |
| 30 hg status | |
| 31 hg id | |
| 32 hg revert | |
| 33 hg diff | |
| 34 hg status | |
| 35 hg id | |
| 36 hg revert -r tip | |
| 37 hg diff | |
| 38 hg status | |
| 39 hg id | |
| 40 hg update -C | |
| 41 hg diff | |
| 42 hg status | |
| 43 hg id | |
| 44 cd ..; /bin/rm -rf t | |
| 45 |