Mercurial > hg > mercurial-crew-with-dirclash
annotate .hgtags @ 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 | 4f81068ed8cd |
children | 703783bc09c4 |
rev | line source |
---|---|
66 | 1 d40cc5aacc31ed673d9b5b24f98bee78c283062c 0.4f |
2 1c590d34bf61e2ea12c71738e5a746cd74586157 0.4e | |
3 7eca4cfa8aad5fce9a04f7d8acadcd0452e2f34e 0.4d | |
4 b4d0c3786ad3e47beacf8412157326a32b6d25a4 0.4c | |
189 | 5 f40273b0ad7b3a6d3012fd37736d0611f41ecf54 0.5 |
194 | 6 0a28dfe59f8fab54a5118c5be4f40da34a53cdb7 0.5b |
458
ff8fbf99cd64
Added tag 0.6 for changeset 12e0fdbc57a0be78f0e817fd1d170a3615cd35da
mpm@selenic.com
parents:
194
diff
changeset
|
7 12e0fdbc57a0be78f0e817fd1d170a3615cd35da 0.6 |
685
79fb7032739f
Added tag 0.6b for changeset 4ccf3de52989b14c3d84e1097f59e39a992e00bd
Matt Mackall <mpm@selenic.com>
parents:
458
diff
changeset
|
8 4ccf3de52989b14c3d84e1097f59e39a992e00bd 0.6b |
972
0bc72d91aeda
Added tag 0.6c for changeset eac9c8efcd9bd8244e72fb6821f769f450457a32
mpm@selenic.com
parents:
685
diff
changeset
|
9 eac9c8efcd9bd8244e72fb6821f769f450457a32 0.6c |