mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
cc612c476f
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.
114 lines
1.7 KiB
Bash
Executable File
114 lines
1.7 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
branchcache=.hg/branchheads.cache
|
|
|
|
hg init t
|
|
cd t
|
|
hg branches
|
|
|
|
echo foo > a
|
|
hg add a
|
|
hg ci -m "initial"
|
|
hg branch foo
|
|
hg branch
|
|
hg ci -m "add branch name"
|
|
hg branch bar
|
|
hg ci -m "change branch name"
|
|
echo % branch shadowing
|
|
hg branch default
|
|
hg branch -f default
|
|
hg ci -m "clear branch name"
|
|
|
|
echo % there should be only one default branch head
|
|
hg heads .
|
|
|
|
hg co foo
|
|
hg branch
|
|
echo bleah > a
|
|
hg ci -m "modify a branch"
|
|
|
|
hg merge default
|
|
hg branch
|
|
hg ci -m "merge"
|
|
hg log
|
|
|
|
hg branches
|
|
hg branches -q
|
|
|
|
echo % test for invalid branch cache
|
|
hg rollback
|
|
cp $branchcache .hg/bc-invalid
|
|
hg log -r foo
|
|
cp .hg/bc-invalid $branchcache
|
|
hg --debug log -r foo
|
|
rm $branchcache
|
|
echo corrupted > $branchcache
|
|
hg log -qr foo
|
|
cat $branchcache
|
|
|
|
echo % push should update the branch cache
|
|
hg init ../target
|
|
echo % pushing just rev 0
|
|
hg push -qr 0 ../target
|
|
cat ../target/$branchcache
|
|
echo % pushing everything
|
|
hg push -qf ../target
|
|
cat ../target/$branchcache
|
|
|
|
echo % update with no arguments: tipmost revision of the current branch
|
|
hg up -q -C 0
|
|
hg up -q
|
|
hg id
|
|
hg up -q 1
|
|
hg up -q
|
|
hg id
|
|
hg branch foobar
|
|
hg up
|
|
|
|
echo % fastforward merge
|
|
hg branch ff
|
|
echo ff > ff
|
|
hg ci -Am'fast forward'
|
|
hg up foo
|
|
hg merge ff
|
|
hg branch
|
|
hg commit -m'Merge ff into foo'
|
|
hg parents
|
|
hg manifest
|
|
|
|
echo % test merging, add 3 default heads and one test head
|
|
cd ..
|
|
hg init merges
|
|
cd merges
|
|
echo a > a
|
|
hg ci -Ama
|
|
|
|
echo b > b
|
|
hg ci -Amb
|
|
|
|
hg up 0
|
|
echo c > c
|
|
hg ci -Amc
|
|
|
|
hg up 0
|
|
echo d > d
|
|
hg ci -Amd
|
|
|
|
hg up 0
|
|
hg branch test
|
|
echo e >> e
|
|
hg ci -Ame
|
|
|
|
hg log
|
|
|
|
echo % implicit merge with test branch as parent
|
|
hg merge
|
|
hg up -C default
|
|
echo % implicit merge with default branch as parent
|
|
hg merge
|
|
echo % 3 branch heads, explicit merge required
|
|
hg merge 2
|
|
hg ci -m merge
|
|
echo % 2 branch heads, implicit merge works
|
|
hg merge
|