tests/test-merge-revert2
author Dirkjan Ochtman <dirkjan@ochtman.nl>
Thu, 21 Feb 2008 15:00:25 +0100
changeset 6152 c050548307a4
parent 4387 93a4e72b4f83
child 12156 4c94b6d0fb1c
permissions -rwxr-xr-x
hgweb: use bundletypes from mercurial.changegroup

#!/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 "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 --no-backup --all
hg diff
hg status
hg id
hg update
hg diff
hg status
hg id
hg update -C 0
echo "changed file1 different" >> file1
hg update
hg diff --nodates
hg status
hg id
hg revert --no-backup --all
hg diff
hg status
hg id
hg revert -r tip --no-backup --all
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id