##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

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
mpm@selenic.com - - Load All Authors

File last commit:

r981:4f81068e merge default
r993:6f274afc default
Show More
test-copy.out
27 lines | 661 B | text/plain | TextLexer
/ tests / test-copy.out
History | Annotation | Raw |Copy content |Copy permalink
A b
b
b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
changeset: 1:3b5b84850bbe
tag: tip
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 2
changeset: 0:c19d34741b0a
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 1
changeset: 0:c19d34741b0a
user: test
date: Thu Jan 1 00:00:00 1970 +0000
summary: 1
566e338d09a089ba737c21e0d3759980 .hg/data/b.d
60b725f10c9c85c70d97880dfe8191b3 bsum
60b725f10c9c85c70d97880dfe8191b3 asum
checking changesets
checking manifests
crosschecking files in changesets and manifests
checking files
2 files, 2 changesets, 2 total revisions