Show More
@@ -330,7 +330,7 b' static PyObject *pack_dirstate(PyObject ' | |||||
330 | * this. */ |
|
330 | * this. */ | |
331 | if (PyDict_SetItem(map, k, dirstate_unset) == -1) |
|
331 | if (PyDict_SetItem(map, k, dirstate_unset) == -1) | |
332 | goto bail; |
|
332 | goto bail; | |
333 | mode = 0, size = -1, mtime = -1; |
|
333 | mtime = -1; | |
334 | } |
|
334 | } | |
335 | putbe32(mode, p); |
|
335 | putbe32(mode, p); | |
336 | putbe32(size, p + 4); |
|
336 | putbe32(size, p + 4); |
@@ -100,11 +100,11 b' def pack_dirstate(dmap, copymap, pl, now' | |||||
100 | # systems with a granularity of 1 sec). This commonly happens |
|
100 | # systems with a granularity of 1 sec). This commonly happens | |
101 | # for at least a couple of files on 'update'. |
|
101 | # for at least a couple of files on 'update'. | |
102 | # The user could change the file without changing its size |
|
102 | # The user could change the file without changing its size | |
103 |
# within the same second. Invalidate the file's |
|
103 | # within the same second. Invalidate the file's mtime in | |
104 | # dirstate, forcing future 'status' calls to compare the |
|
104 | # dirstate, forcing future 'status' calls to compare the | |
105 |
# contents of the file |
|
105 | # contents of the file if the size is the same. This prevents | |
106 | # files as clean. |
|
106 | # mistakenly treating such files as clean. | |
107 |
e = (e[0], |
|
107 | e = (e[0], e[1], e[2], -1) | |
108 | dmap[f] = e |
|
108 | dmap[f] = e | |
109 |
|
109 | |||
110 | if f in copymap: |
|
110 | if f in copymap: |
General Comments 0
You need to be logged in to leave comments.
Login now