Mercurial > hg > mercurial-crew-with-dirclash
diff tests/test-merge-revert @ 808:8f5637f0a0c0
Merge with TAH
author | mpm@selenic.com |
---|---|
date | Sat, 30 Jul 2005 08:35:29 -0800 |
parents | 69db1e34378b |
children | ad8ff3534fde 1fe3b14c7044 9c918287d10b |
line wrap: on
line diff
new file mode 100755 --- /dev/null +++ b/tests/test-merge-revert @@ -0,0 +1,46 @@ +#!/bin/sh +# FIXME: This test may fail due to an uncritical bug in Mercurial. + +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 +