equal
deleted
inserted
replaced
709 if not node2: |
709 if not node2: |
710 if l: |
710 if l: |
711 # do a full compare of any files that might have changed |
711 # do a full compare of any files that might have changed |
712 change = self.changelog.read(self.dirstate.parents()[0]) |
712 change = self.changelog.read(self.dirstate.parents()[0]) |
713 mf1 = self.manifest.read(change[0]) |
713 mf1 = self.manifest.read(change[0]) |
714 for f in lookup: |
714 for f in l: |
715 if fcmp(f, mf): |
715 if fcmp(f, mf1): |
716 c.append(f) |
716 c.append(f) |
717 return (c, a, d, u) |
717 return (c, a, d, u) |
718 |
718 |
719 # are we comparing working dir against non-tip? |
719 # are we comparing working dir against non-tip? |
720 # generate a pseudo-manifest for the working dir |
720 # generate a pseudo-manifest for the working dir |