view tests/test-merge-revert @ 1770:4eea6a747c27

hgmerge: fix diff+patch detection; cleanups Details: - actually show help message when no tools are found - whitespace cleanup (stupid emacs) - quote more variables - simplify merge/diff3 error handling
author Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>
date Tue, 21 Feb 2006 15:48:09 -0600
parents 9c918287d10b
children 7544700fd931
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 "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" >> 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