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

r839:9c918287 merge default
r993:6f274afc default
Show More
test-clone
27 lines | 266 B | text/plain | TextLexer
#!/bin/sh
mkdir a
cd a
hg init
echo a > a
hg add a
hg commit -m test -d '0 0'
# Default operation
hg clone . ../b
cd ../b
cat a
hg verify
# No update
hg clone -U . ../c
cd ../c
cat a
hg verify
# Default destination
mkdir ../d
cd ../d
hg clone ../a
cd a
hg cat a