mercurial/localrepo.py
changeset 10176 24ce8f0c0a39
parent 10011 a9836feb5a8c
child 10264 d6512b3e9ac0
equal deleted inserted replaced
10175:fc32b2fc468e 10176:24ce8f0c0a39
   998                 if f not in ctx1:
   998                 if f not in ctx1:
   999                     self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
   999                     self.ui.warn('%s: %s\n' % (self.dirstate.pathto(f), msg))
  1000             match.bad = bad
  1000             match.bad = bad
  1001 
  1001 
  1002         if working: # we need to scan the working dir
  1002         if working: # we need to scan the working dir
  1003             s = self.dirstate.status(match, listignored, listclean, listunknown)
  1003             subrepos = ctx1.substate.keys()
       
  1004             s = self.dirstate.status(match, subrepos, listignored,
       
  1005                                      listclean, listunknown)
  1004             cmp, modified, added, removed, deleted, unknown, ignored, clean = s
  1006             cmp, modified, added, removed, deleted, unknown, ignored, clean = s
  1005 
  1007 
  1006             # check for any possibly clean files
  1008             # check for any possibly clean files
  1007             if parentworking and cmp:
  1009             if parentworking and cmp:
  1008                 fixup = []
  1010                 fixup = []