marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches.
REVISION SUMMARY This flag is only used with 'n' so lets set the state based on that parameter in this case. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D10971 AFFECTED FILES mercurial/dirstate.py mercurial/dirstatemap.py rust/hg-core/src/dirstate/dirstate_map.rs rust/hg-core/src/dirstate_tree/dirstate_map.rs CHANGE DETAILS diff --git a/rust/hg-core/src/dirstate_tree/dirstate_map.rs b/rust/hg-core/src/dirstate_tree/dirstate_map.rs --- a/rust/hg-core/src/dirstate_tree/dirstate_map.rs +++ b/rust/hg-core/src/dirstate_tree/dirstate_map.rs @@ -742,6 +742,7 @@ entry.mtime = MTIME_UNSET; } else if from_p2 { assert!(!possibly_dirty); + entry.state = EntryState::Normal; entry.size = SIZE_FROM_OTHER_PARENT; entry.mtime = MTIME_UNSET; } else if possibly_dirty { diff --git a/rust/hg-core/src/dirstate/dirstate_map.rs b/rust/hg-core/src/dirstate/dirstate_map.rs --- a/rust/hg-core/src/dirstate/dirstate_map.rs +++ b/rust/hg-core/src/dirstate/dirstate_map.rs @@ -91,6 +91,7 @@ entry.mtime = MTIME_UNSET; } else if from_p2 { assert!(!possibly_dirty); + entry.state = EntryState::Normal; entry.size = SIZE_FROM_OTHER_PARENT; entry.mtime = MTIME_UNSET; } else if possibly_dirty { diff --git a/mercurial/dirstatemap.py b/mercurial/dirstatemap.py --- a/mercurial/dirstatemap.py +++ b/mercurial/dirstatemap.py @@ -172,6 +172,7 @@ mtime = AMBIGUOUS_TIME elif from_p2: assert not possibly_dirty + state = b'n' size = FROM_P2 mtime = AMBIGUOUS_TIME elif possibly_dirty: diff --git a/mercurial/dirstate.py b/mercurial/dirstate.py --- a/mercurial/dirstate.py +++ b/mercurial/dirstate.py @@ -543,7 +543,7 @@ self._addpath(f, merged=True) else: # add-like - self._addpath(f, b'n', 0, from_p2=True) + self._addpath(f, from_p2=True) self._map.copymap.pop(f, None) def add(self, f): To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
