Mercurial > hg
comparison mercurial/configitems.py @ 45579:b9d6ab6cdeb4
configitems: add a new config option to control new filenode functionality
This series is adding functionality where we can force create a new filenode for
some files on a merge-commit. This is meant to represent an explicit choice made
by user and hence distingusing the file in the merged commit with the file in
parent by creating a new filenode instead of using the parent one.
This introduces a experimental config option under which this functionality
will be hidden.
A new testcase is added in tests/test-merge-criss-cross.t to test the new
functionality while making the option does not break other scenarios.
Differential Revision: https://phab.mercurial-scm.org/D9026
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Mon, 14 Sep 2020 14:31:23 +0530 |
parents | 32ce4cbaec4b |
children | ed84a4d48910 |
comparison
equal
deleted
inserted
replaced
45578:f9a3edf2dee4 | 45579:b9d6ab6cdeb4 |
---|---|
588 b'experimental', b'extra-filter-revs', default=None, | 588 b'experimental', b'extra-filter-revs', default=None, |
589 ) | 589 ) |
590 coreconfigitem( | 590 coreconfigitem( |
591 b'experimental', b'maxdeltachainspan', default=-1, | 591 b'experimental', b'maxdeltachainspan', default=-1, |
592 ) | 592 ) |
593 # tracks files which were undeleted (merge might delete them but we explicitly | |
594 # kept/undeleted them) and creates new filenodes for them | |
595 coreconfigitem( | |
596 b'experimental', b'merge-track-salvaged', default=False, | |
597 ) | |
593 coreconfigitem( | 598 coreconfigitem( |
594 b'experimental', b'mergetempdirprefix', default=None, | 599 b'experimental', b'mergetempdirprefix', default=None, |
595 ) | 600 ) |
596 coreconfigitem( | 601 coreconfigitem( |
597 b'experimental', b'mmapindexthreshold', default=None, | 602 b'experimental', b'mmapindexthreshold', default=None, |