mercurial/manifest.py
changeset 36300 413c179cf7d5
parent 36174 b42c47b8c9d4
child 36301 5245bac09e6a
equal deleted inserted replaced
36299:238646784294 36300:413c179cf7d5
   958                     m2 = t2._dirs[d]
   958                     m2 = t2._dirs[d]
   959                     _filesnotin(m1, m2)
   959                     _filesnotin(m1, m2)
   960                 else:
   960                 else:
   961                     files.update(m1.iterkeys())
   961                     files.update(m1.iterkeys())
   962 
   962 
   963             for fn in t1._files.iterkeys():
   963             for fn in t1._files:
   964                 if fn not in t2._files:
   964                 if fn not in t2._files:
   965                     files.add(t1._subpath(fn))
   965                     files.add(t1._subpath(fn))
   966 
   966 
   967         _filesnotin(self, m2)
   967         _filesnotin(self, m2)
   968         return files
   968         return files