Show More
@@ -271,8 +271,7 b' class dirstatemap(object):' | |||||
271 | self.addfile(filename, from_p2=True) |
|
271 | self.addfile(filename, from_p2=True) | |
272 | return |
|
272 | return | |
273 | elif not (p1_tracked or p2_tracked) and wc_tracked: |
|
273 | elif not (p1_tracked or p2_tracked) and wc_tracked: | |
274 | self.addfile(filename, added=True, possibly_dirty=possibly_dirty) |
|
274 | pass # file is added, nothing special to adjust | |
275 | return |
|
|||
276 | elif (p1_tracked or p2_tracked) and not wc_tracked: |
|
275 | elif (p1_tracked or p2_tracked) and not wc_tracked: | |
277 | pass |
|
276 | pass | |
278 | elif clean_p2 and wc_tracked: |
|
277 | elif clean_p2 and wc_tracked: |
General Comments 0
You need to be logged in to leave comments.
Login now