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

r981:4f81068e merge default
r993:6f274afc default
Show More
test-undo.out
18 lines | 446 B | text/plain | TextLexer
mpm@selenic.com
Add some more tests...
r336 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
1 files, 1 changesets, 1 total revisions
mpm@selenic.com
Fix tests for short changeset hashes and hidden manifest hashes
r784 changeset: 0:acb14030fe0a
Thomas Arendsen Hein
Fixed tests for displaying tags in hg history and hg parents....
r388 tag: tip
mpm@selenic.com
Add some more tests...
r336 user: test
Samuel Tardieu
[PATCH] Print timezone offset when outputting dates...
r967 date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com
Add some more tests...
r336 summary: test
mpm@selenic.com
Update undo test...
r502 rolling back last transaction
mpm@selenic.com
Add some more tests...
r336 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
0 files, 0 changesets, 0 total revisions
A a