##// 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-copy.out
27 lines | 661 B | text/plain | TextLexer
mpm@selenic.com
Add hg copy...
r363 A b
b
b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
mpm@selenic.com
Fix tests for short changeset hashes and hidden manifest hashes
r784 changeset: 1:3b5b84850bbe
Thomas Arendsen Hein
Fixed tests for displaying tags in hg history and hg parents....
r388 tag: tip
mpm@selenic.com
Add hg copy...
r363 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 hg copy...
r363 summary: 2
mpm@selenic.com
Fix tests for short changeset hashes and hidden manifest hashes
r784 changeset: 0:c19d34741b0a
mpm@selenic.com
Add hg copy...
r363 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 hg copy...
r363 summary: 1
mpm@selenic.com
Fix tests for short changeset hashes and hidden manifest hashes
r784 changeset: 0:c19d34741b0a
mpm@selenic.com
Add hg copy...
r363 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 hg copy...
r363 summary: 1
Thomas Arendsen Hein
Updated output of tests.
r801 566e338d09a089ba737c21e0d3759980 .hg/data/b.d
mpm@selenic.com
run-tests: remove '+ hg' trick...
r925 60b725f10c9c85c70d97880dfe8191b3 bsum
60b725f10c9c85c70d97880dfe8191b3 asum
mpm@selenic.com
Add hg copy...
r363 checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions