Mercurial > public > mercurial-scm > hg-stable
comparison mercurial/cext/parsers.c @ 48448:0b3f3a3ca50a
dirstate-item: ignore mtime to write v1 when `mtime-second-ambiguous` is set
We cannot preserve that information in the v1 format so that mtime is ambiguous.
Differential Revision: https://phab.mercurial-scm.org/D11844
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Wed, 24 Nov 2021 04:59:48 +0100 |
| parents | af303ae33cd7 |
| children | be2317167a9b |
comparison
equal
deleted
inserted
replaced
| 48447:af303ae33cd7 | 48448:0b3f3a3ca50a |
|---|---|
| 267 if (dirstate_item_c_removed(self)) { | 267 if (dirstate_item_c_removed(self)) { |
| 268 return 0; | 268 return 0; |
| 269 } else if (!(self->flags & dirstate_flag_has_mtime) || | 269 } else if (!(self->flags & dirstate_flag_has_mtime) || |
| 270 !(self->flags & dirstate_flag_p1_tracked) || | 270 !(self->flags & dirstate_flag_p1_tracked) || |
| 271 !(self->flags & dirstate_flag_wc_tracked) || | 271 !(self->flags & dirstate_flag_wc_tracked) || |
| 272 (self->flags & dirstate_flag_p2_info)) { | 272 (self->flags & dirstate_flag_p2_info) || |
| 273 (self->flags & dirstate_flag_mtime_second_ambiguous)) { | |
| 273 return ambiguous_time; | 274 return ambiguous_time; |
| 274 } else { | 275 } else { |
| 275 return self->mtime_s; | 276 return self->mtime_s; |
| 276 } | 277 } |
| 277 } | 278 } |