##// 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:

r814:0902ffec merge default
r993:6f274afc default
Show More
test-tag
13 lines | 180 B | text/plain | TextLexer
Thomas Arendsen Hein
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
r800 #!/bin/sh
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401
hg init
echo a > a
hg add a
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "test" -d "0 0"
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 hg history
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg tag -d "0 0" "bleah"
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401 hg history
echo foo >> .hgtags
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg tag -d "0 0" "bleah2" || echo "failed"
mpm@selenic.com
From: Radoslaw Szkodzinski <astralstorm@gorzow.mm.pl>...
r401