sapling/tests/test-merge-revert

#!/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"
echo "changed file1" >> file1
hg commit -m "changed file1"
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
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris. 2005-07-29 18:19:43 +04:00			`#!/bin/sh`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00
			`mkdir t`
			`cd t`
			`hg init`
			`echo "added file1" > file1`
			`echo "added file2" > file2`
			`hg add file1 file2`
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand. 2010-09-03 01:22:51 +04:00			`hg commit -m "added file1 and file2"`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`echo "changed file1" >> file1`
tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand. 2010-09-03 01:22:51 +04:00			`hg commit -m "changed file1"`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`hg -q log`
			`hg id`
			`hg update -C 0`
			`hg id`
			`echo "changed file1" >> file1`
			`hg id`
revert: require --all to revert all files. 2006-08-21 20:44:52 +04:00			`hg revert --all`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`hg diff`
			`hg status`
			`hg id`
			`hg update`
			`hg diff`
			`hg status`
			`hg id`
			`hg update -C 0`
			`echo "changed file1" >> file1`
change tests to use simplemerge by default 2007-04-17 03:17:39 +04:00			`hg update`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`hg diff`
			`hg status`
			`hg id`
revert: require --all to revert all files. 2006-08-21 20:44:52 +04:00			`hg revert --all`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`hg diff`
			`hg status`
			`hg id`
revert: require --all to revert all files. 2006-08-21 20:44:52 +04:00			`hg revert -r tip --all`
Added tests for bug with three-way-merging of old tip, tip and cwd. 2005-07-23 20:14:05 +04:00			`hg diff`
			`hg status`
			`hg id`
			`hg update -C`
			`hg diff`
			`hg status`
			`hg id`