view tests/test-merge-revert @ 2590:911b56853fdd

Additional information about URLs in pull/push/clone/init: - clone to ssh:// - init via ssh:// - example for pull from an absolute directory via ssh:// - push to http:// and https://
author Thomas Arendsen Hein <thomas@intevation.de>
date Tue, 11 Jul 2006 22:36:52 +0200
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