Show More
@@ -298,8 +298,7 b' class dirstatemap(object):' | |||||
298 | self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty) |
|
298 | self.addfile(filename, from_p2=True, possibly_dirty=possibly_dirty) | |
299 | return |
|
299 | return | |
300 | elif possibly_dirty: |
|
300 | elif possibly_dirty: | |
301 | self.addfile(filename, possibly_dirty=possibly_dirty) |
|
301 | pass | |
302 | return |
|
|||
303 | elif wc_tracked: |
|
302 | elif wc_tracked: | |
304 | # this is a "normal" file |
|
303 | # this is a "normal" file | |
305 | if parentfiledata is None: |
|
304 | if parentfiledata is None: |
General Comments 0
You need to be logged in to leave comments.
Login now