| Alphare | |
| pulkit |
| hg-reviewers |
When detecting fresh value (from current rev) overwriting older ones during
merges, we also record this overwrite for to help potential future comparison.
This does really have any performance effect right now, but it get use closer to
be able to drop all is_ancestors when merging.
| Automatic diff as part of commit; lint not applicable. |
| Automatic diff as part of commit; unit tests not applicable. |
| Path | Packages | |||
|---|---|---|---|---|
| M | rust/hg-core/src/copy_tracing.rs (2 lines) |
| // deletion | // deletion | ||||
| MergePick::Any | MergePick::Any | ||||
| } else { | } else { | ||||
| unreachable!(); | unreachable!(); | ||||
| } | } | ||||
| } else { | } else { | ||||
| // The last value comes the current merge, this value -will- win | // The last value comes the current merge, this value -will- win | ||||
| // eventually. | // eventually. | ||||
| oracle.record_overwrite(src_minor.rev, src_major.rev); | |||||
| MergePick::Major | MergePick::Major | ||||
| } | } | ||||
| } else if src_minor.rev == current_merge { | } else if src_minor.rev == current_merge { | ||||
| // The last value comes the current merge, this value -will- win | // The last value comes the current merge, this value -will- win | ||||
| // eventually. | // eventually. | ||||
| oracle.record_overwrite(src_major.rev, src_minor.rev); | |||||
| MergePick::Minor | MergePick::Minor | ||||
| } else if src_major.path == src_minor.path { | } else if src_major.path == src_minor.path { | ||||
| // we have the same value, but from other source; | // we have the same value, but from other source; | ||||
| if src_major.rev == src_minor.rev { | if src_major.rev == src_minor.rev { | ||||
| // If the two entry are identical, they are both valid | // If the two entry are identical, they are both valid | ||||
| MergePick::Any | MergePick::Any | ||||
| } else if oracle.is_overwrite(src_major.rev, src_minor.rev) { | } else if oracle.is_overwrite(src_major.rev, src_minor.rev) { | ||||
| MergePick::Minor | MergePick::Minor | ||||