Mercurial > hg

view tests/test-merge-revert2 @ 797:95c258ee5264

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove "export FOO=bar" bashism.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 29 Jul 2005 14:54:36 +0100
parents 49ec802b4a16
children ec85f9e6f3b1
line wrap: on
line source

#!/bin/sh -x

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 "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/\(\(---\|+++\).*\)\t.*/\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