Mercurial > public > mercurial-scm > hg-stable
diff 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 |
line wrap: on
line diff
--- a/mercurial/cext/parsers.c Wed Nov 24 04:51:05 2021 +0100 +++ b/mercurial/cext/parsers.c Wed Nov 24 04:59:48 2021 +0100 @@ -269,7 +269,8 @@ } else if (!(self->flags & dirstate_flag_has_mtime) || !(self->flags & dirstate_flag_p1_tracked) || !(self->flags & dirstate_flag_wc_tracked) || - (self->flags & dirstate_flag_p2_info)) { + (self->flags & dirstate_flag_p2_info) || + (self->flags & dirstate_flag_mtime_second_ambiguous)) { return ambiguous_time; } else { return self->mtime_s;