Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-tags.out @ 990:5007e0bdeed2
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.
author | mpm@selenic.com |
---|---|
date | Sun, 21 Aug 2005 21:59:55 -0700 |
parents | 5a034646e472 |
children | 6f274afc05c7 |
rev | line source |
---|---|
345 | 1 unknown |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
345
diff
changeset
|
2 acb14030fe0a tip |
345 | 3 acb14030fe0a21b60322c440ad2d20cf7685a376 first |
925 | 4 tip 1:b9154636be938d3d431e75a7c906504a079bfe07 |
345 | 5 first 0:acb14030fe0a21b60322c440ad2d20cf7685a376 |
925 | 6 b9154636be93 tip |
748 | 7 M a |
925 | 8 b9154636be93+ tip |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
345
diff
changeset
|
9 acb14030fe0a+ first |
345 | 10 acb14030fe0a21b60322c440ad2d20cf7685a376+ first |
748 | 11 M a |
374
f07d00fcd281
update tests to reflect new short hash length
mpm@selenic.com
parents:
345
diff
changeset
|
12 c8edf04160c7 tip |
990 | 13 c8edf04160c7+b9154636be93 tip |