Mercurial > hg-stable

changeset 24181:5245caa0dcde

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
dirstate: clarify comment about leaving normal files undef if changed 'now' Clarify that they only are saved as undef if they were marked as normal and changed in the same second.
author Mads Kiilerich <madski@unity3d.com>
date Wed, 14 Jan 2015 01:15:26 +0100
parents d8e0c591781c
children 00ef3edcf1d5
files mercurial/dirstate.py
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/dirstate.py	Sun Jan 18 02:38:57 2015 +0100
+++ b/mercurial/dirstate.py	Wed Jan 14 01:15:26 2015 +0100
@@ -882,9 +882,9 @@
                 elif time != mtime and time != mtime & _rangemask:
                     ladd(fn)
                 elif mtime == lastnormaltime:
-                    # fn may have been changed in the same timeslot without
-                    # changing its size. This can happen if we quickly do
-                    # multiple commits in a single transaction.
+                    # fn may have just been marked as normal and it may have
+                    # changed in the same second without changing its size.
+                    # This can happen if we quickly do multiple commits.
                     # Force lookup, so we don't miss such a racy file change.
                     ladd(fn)
                 elif listclean: