##// END OF EJS Templates
Added tests for bug with three-way-merging of old tip, tip and cwd.
Added tests for bug with three-way-merging of old tip, tip and cwd.

File last commit:

r749:7e4843b7 default
r792:49ec802b default
Show More
test-tags
34 lines | 404 B | text/plain | TextLexer
#!/bin/sh
set -x
mkdir t
cd t
hg init
hg id
echo a > a
hg add a
hg commit -m "test" -d "0 0"
hg co
hg identify
T=`hg -q tip | cut -d : -f 2`
echo "$T first" > .hgtags
cat .hgtags
hg add .hgtags
hg commit -m "add tags" -d "0 0"
hg tags
hg identify
echo bb > a
hg status
hg identify
hg co first
hg id
hg -v id
hg status
echo 1 > b
hg add b
hg commit -m "branch" -d "0 0"
hg id
hg co -m 1
hg id
hg status