mercurial/dirstate.py
changeset 48148 e2753a7acfa7
parent 48147 142e9f0a70b5
child 48223 b4f83c9e7905
equal deleted inserted replaced
48147:142e9f0a70b5 48148:e2753a7acfa7
  1370             size = t.size
  1370             size = t.size
  1371             time = t.mtime
  1371             time = t.mtime
  1372 
  1372 
  1373             if not st and t.tracked:
  1373             if not st and t.tracked:
  1374                 dadd(fn)
  1374                 dadd(fn)
  1375             elif t.merged or t.from_p2:
  1375             elif t.p2_info:
  1376                 madd(fn)
  1376                 madd(fn)
  1377             elif t.added:
  1377             elif t.added:
  1378                 aadd(fn)
  1378                 aadd(fn)
  1379             elif t.removed:
  1379             elif t.removed:
  1380                 radd(fn)
  1380                 radd(fn)