Skip to content
Snippets Groups Projects
Commit 3429f48d authored by Pierre-Yves David's avatar Pierre-Yves David :octopus:
Browse files

dirstatemap: use the default code to handle "clean-p2" case

This simplify the conditionnal a bit since most of it is handled by the common
code.

Differential Revision: https://phab.mercurial-scm.org/D11326
parent 40cf4b27
No related branches found
No related tags found
No related merge requests found
......@@ -289,11 +289,8 @@
# In addition, this seems to be a case where the file is marked
# as merged without actually being the result of a merge
# action. So thing are not ideal here.
self.addfile(filename, merged=True)
return
else:
self.addfile(filename, from_p2=True)
return
merged = True
clean_p2 = False
elif not p1_tracked and p2_tracked and wc_tracked:
clean_p2 = True
elif possibly_dirty:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment