view tests/test-merge-revert @ 5152:4f648e95caca

Merge with crew-stable
author Brendan Cully <brendan@kublai.com>
date Thu, 09 Aug 2007 12:35:10 -0700
parents 46280c004f22
children 4c94b6d0fb1c
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 --all
hg diff
hg status
hg id
hg update
hg diff
hg status
hg id
hg update -C 0
echo "changed file1" >> file1
hg update
hg diff
hg status
hg id
hg revert --all
hg diff
hg status
hg id
hg revert -r tip --all
hg diff
hg status
hg id
hg update -C
hg diff
hg status
hg id