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

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

commit: force create a new filenode if it was set in mergestate by merge...
commit: force create a new filenode if it was set in mergestate by merge For reasons mentioned in previous commits, we will like to forcefully create a new filenode sometimes. Combination of this patch and previous one, we fixed a case in `test-merge-combination.t`. This does not yet results in conflict where it should, I need to investigate more about what's happening as it should be a change-delete conflict now. Differential Revision: https://phab.mercurial-scm.org/D8989
Pulkit Goyal -
r46159:479cce8c default
Show More
Name Size Modified Last Commit Author
/ rust / hg-cpython / src
dirstate
ancestors.rs Loading ...
cindex.rs Loading ...
conversion.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 ...