Show More
@@ -387,10 +387,8 b' class dirstate(object):' | |||
|
387 | 387 | self._origpl = self._pl |
|
388 | 388 | self._map.setparents(p1, p2) |
|
389 | 389 | copies = {} |
|
390 | if ( | |
|
391 | oldp2 != self._nodeconstants.nullid | |
|
392 | and p2 == self._nodeconstants.nullid | |
|
393 | ): | |
|
390 | nullid = self._nodeconstants.nullid | |
|
391 | if oldp2 != nullid and p2 == nullid: | |
|
394 | 392 | candidatefiles = self._map.non_normal_or_other_parent_paths() |
|
395 | 393 | |
|
396 | 394 | for f in candidatefiles: |
General Comments 0
You need to be logged in to leave comments.
Login now