Show More
@@ -156,7 +156,7 b' class DirstateItem(object):' | |||||
156 | if size == FROM_P2: |
|
156 | if size == FROM_P2: | |
157 | return cls(wc_tracked=True, p2_info=True) |
|
157 | return cls(wc_tracked=True, p2_info=True) | |
158 | elif size == NONNORMAL: |
|
158 | elif size == NONNORMAL: | |
159 | return cls.new_possibly_dirty() |
|
159 | return cls(wc_tracked=True, p1_tracked=True) | |
160 | elif mtime == AMBIGUOUS_TIME: |
|
160 | elif mtime == AMBIGUOUS_TIME: | |
161 | instance = cls.new_normal(mode, size, 42) |
|
161 | instance = cls.new_normal(mode, size, 42) | |
162 | instance._mtime = None |
|
162 | instance._mtime = None |
@@ -75,7 +75,11 b' impl DirstateEntry {' | |||||
75 | mtime: None, |
|
75 | mtime: None, | |
76 | } |
|
76 | } | |
77 | } else if size == SIZE_NON_NORMAL { |
|
77 | } else if size == SIZE_NON_NORMAL { | |
78 |
Self |
|
78 | Self { | |
|
79 | flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED, | |||
|
80 | mode_size: None, | |||
|
81 | mtime: None, | |||
|
82 | } | |||
79 | } else if mtime == MTIME_UNSET { |
|
83 | } else if mtime == MTIME_UNSET { | |
80 | Self { |
|
84 | Self { | |
81 | flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED, |
|
85 | flags: Flags::WDIR_TRACKED | Flags::P1_TRACKED, |
General Comments 0
You need to be logged in to leave comments.
Login now