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

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

commit: reorder if-else conditional to give mergestate info priority...
commit: reorder if-else conditional to give mergestate info priority Looking at the code now, I was unable to find a good reason as why we only rely on mergestate extras info after checking whether a filelog parent is ancestor of other or not. I mean if we have stored in mergestate that `other` was chosed, we should blindly pick that one. This cleanup will also help introduce more cases when both `fparent1` and `fparent2` are non-null but using info from mergestate, we can fastpath. Differential Revision: https://phab.mercurial-scm.org/D10116
Pulkit Goyal -
r47403:39be29fa default
Show More
Name Size Modified Last Commit Author
/ rust / hg-cpython / src
dirstate
ancestors.rs Loading ...
cindex.rs Loading ...
conversion.rs Loading ...
copy_tracing.rs Loading ...
dagops.rs Loading ...
debug.rs Loading ...
dirstate.rs Loading ...
discovery.rs Loading ...
exceptions.rs Loading ...
lib.rs Loading ...
parsers.rs Loading ...
ref_sharing.rs Loading ...
revlog.rs Loading ...
utils.rs Loading ...