diff --git a/rust/hg-core/src/copy_tracing.rs b/rust/hg-core/src/copy_tracing.rs index 0a721fc457bfb63790d5d1eeccf0c8d8cae8f94e_cnVzdC9oZy1jb3JlL3NyYy9jb3B5X3RyYWNpbmcucnM=..ecbb2fc9418ce0d95f62d1cdc2579b7045eb2443_cnVzdC9oZy1jb3JlL3NyYy9jb3B5X3RyYWNpbmcucnM= 100644 --- a/rust/hg-core/src/copy_tracing.rs +++ b/rust/hg-core/src/copy_tracing.rs @@ -244,7 +244,7 @@ } /// returns `true` if `anc` is an ancestors of `desc`, `false` otherwise - fn is_ancestor(&mut self, anc: Revision, desc: Revision) -> bool { + fn is_overwrite(&mut self, anc: Revision, desc: Revision) -> bool { if anc > desc { false } else if anc == desc { @@ -705,7 +705,7 @@ if src_major.rev == src_minor.rev { // If the two entry are identical, they are both valid MergePick::Any - } else if oracle.is_ancestor(src_major.rev, src_minor.rev) { + } else if oracle.is_overwrite(src_major.rev, src_minor.rev) { MergePick::Minor } else { MergePick::Major @@ -733,7 +733,7 @@ // from each side might conflict. The major side will // win such conflict. MergePick::Major - } else if oracle.is_ancestor(src_major.rev, src_minor.rev) { + } else if oracle.is_overwrite(src_major.rev, src_minor.rev) { // If the minor side is strictly newer than the major // side, it should be kept. MergePick::Minor @@ -741,7 +741,7 @@ // without any special case, the "major" value win // other the "minor" one. MergePick::Major - } else if oracle.is_ancestor(src_minor.rev, src_major.rev) { + } else if oracle.is_overwrite(src_minor.rev, src_major.rev) { // the "major" rev is a direct ancestors of "minor", // any different value should // overwrite