##// END OF EJS Templates
dirstate: make a conditionnal easier to read in `setparents`...
marmoute -
r48801:dd267f16 default
parent child Browse files
Show More
@@ -387,10 +387,8 class dirstate(object):
387 self._origpl = self._pl
387 self._origpl = self._pl
388 self._map.setparents(p1, p2)
388 self._map.setparents(p1, p2)
389 copies = {}
389 copies = {}
390 if (
390 nullid = self._nodeconstants.nullid
391 oldp2 != self._nodeconstants.nullid
391 if oldp2 != nullid and p2 == nullid:
392 and p2 == self._nodeconstants.nullid
393 ):
394 candidatefiles = self._map.non_normal_or_other_parent_paths()
392 candidatefiles = self._map.non_normal_or_other_parent_paths()
395
393
396 for f in candidatefiles:
394 for f in candidatefiles:
General Comments 0
You need to be logged in to leave comments. Login now