Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-merge-revert @ 1643:747c8d03bd29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
bash_completion: ignore hg help error messages They are usually not useful when you're completing stuff and end up cluttering the screen.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 27 Jan 2006 12:15:39 +0100
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