mirror of
https://github.com/facebook/sapling.git
synced 2024-10-09 08:18:15 +03:00
1c695e6dc6
Summary: Previously, we were clearing entries in `hgDirstateTuples` for which: ``` mergeState == NotApplicable ``` but we should have been checking for: ``` mergeState == NotApplicable AND status == Normal ``` The previous logic was causing us to erroneously clear entries in a state like: ``` mergeState == NotApplicable AND status == MarkedForRemoval ``` This bug manifested itself when grafting a change that removed a file. The file was removed from disk, but Eden did not know that it had been `MarkedForRemoval`, so it would report the removed file as "missing" in `hg status`. Reviewed By: wez Differential Revision: D5797270 fbshipit-source-id: 29740dfaa8102db868b95e932716773787f317ac |
||
---|---|---|
.. | ||
cli | ||
docs | ||
fs | ||
hooks | ||
integration | ||
DEFS |