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

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

Fix long-standing excessive file merges...
Fix long-standing excessive file merges Since switching to the multihead approach, we've been creating excessive file-level merges where files are marked as merged with their ancestors. This explicitly checks at commit time whether the two parent versions are linearly related, and if so, reduces the file check-in to a non-merge. Then the file is compared against the remaining parent, and, if equal, skips check-in of that file (as it's not changed). Since we're not checking in all files that were different between versions, we no longer need to mark so many files for merge. This removes most of the 'm' state marking as well. Finally, it is possible to do a tree-level merge with no file-level changes. This will happen if one user changes file A and another changes file B. Thus, if we have have two parents, we allow commit to proceed even if there are no file-level changes.
mpm@selenic.com - - Load All Authors

File last commit:

r981:4f81068e merge default
r990:5007e0bd default
Show More
test-undo.out
18 lines | 446 B | text/plain | TextLexer
/ tests / test-undo.out
History | Source | Raw |Copy content |Copy permalink
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