tests/test-merge-revert2
author mpm@selenic.com
Sat, 13 Aug 2005 19:43:42 -0800
changeset 896 01215ad0428341bf0b5806b199c54fe158d9affd
parent 866 6d6095823b82f32c7d20230c4b7fc18fe6343dae
parent 895 77b52b864249768a0ec615af331be778fdbb65e9
child 949 d997148155f2ece1f61ec5a7ca83650c1d47e7ec
child 953 52d8d81e72ad780f79e93e811383e4b2c31769bd
child 981 4f81068ed8cd48952eb87740d65bb8baa121a009
permissions -rwxr-xr-x
Merge with BOS

#!/bin/sh

mkdir t
cd t
hg init
echo "added file1" > file1
echo "another line of text" >> file1
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
hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/"
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