##// END OF EJS Templates
Clean up some merge logic...
Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases

File last commit:

r925:5a034646 default
r993:6f274afc default
Show More
test-tags
33 lines | 409 B | text/plain | TextLexer
#!/bin/sh
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 tip -v | head -n 1 | cut -d : -f 3`
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