##// 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-empty-dir
16 lines | 191 B | text/plain | TextLexer
mpm@selenic.com
Remove empty directories on update...
r578 #!/bin/sh
hg init
echo 123 > a
hg add a
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "first" -d "0 0" a
mpm@selenic.com
Remove empty directories on update...
r578 mkdir sub
echo 321 > sub/b
hg add sub/b
mpm@selenic.com
Update tests to use commit -m and default -u...
r749 hg commit -m "second" -d "0 0" sub/b
mpm@selenic.com
Remove empty directories on update...
r578 cat sub/b
hg co 0
cat sub/b
ls sub
true