view tests/test-merge-revert @ 2027:94d3170399e1

work around python bug on solaris 10. write to file opened mode 'a+' should write to end of file and update offset pointer, but does not (solaris 10 has python 2.3.3). fix is to always seek.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Thu, 30 Mar 2006 19:28:41 -0800
parents 7544700fd931
children 890e285c52a1
line wrap: on
line source

#!/bin/sh

mkdir t
cd t
hg init
echo "added file1" > file1
echo "added file2" > file2
hg add file1 file2
hg commit -m "added file1 and file2" -d "1000000 0" -u user
echo "changed file1" >> file1
hg commit -m "changed file1" -d "1000000 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" >> file1
HGMERGE=merge hg update
hg diff
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