Mercurial > hg
comparison mercurial/dirstatemap.py @ 47901:3429f48d486d
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
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 16 Jul 2021 17:20:17 +0200 |
parents | 40cf4b278f8f |
children | 4cade5e944c2 |
comparison
equal
deleted
inserted
replaced
47900:40cf4b278f8f | 47901:3429f48d486d |
---|---|
287 # p1_tracked argument is False. | 287 # p1_tracked argument is False. |
288 # | 288 # |
289 # In addition, this seems to be a case where the file is marked | 289 # In addition, this seems to be a case where the file is marked |
290 # as merged without actually being the result of a merge | 290 # as merged without actually being the result of a merge |
291 # action. So thing are not ideal here. | 291 # action. So thing are not ideal here. |
292 self.addfile(filename, merged=True) | 292 merged = True |
293 return | 293 clean_p2 = False |
294 else: | |
295 self.addfile(filename, from_p2=True) | |
296 return | |
297 elif not p1_tracked and p2_tracked and wc_tracked: | 294 elif not p1_tracked and p2_tracked and wc_tracked: |
298 clean_p2 = True | 295 clean_p2 = True |
299 elif possibly_dirty: | 296 elif possibly_dirty: |
300 pass | 297 pass |
301 elif wc_tracked: | 298 elif wc_tracked: |