| changeset 2491 | ffde9eb23f59 |
| parent 2478 | 287b7da4aeaa |
| child 2548 | 0229ff95faec |
| child 2549 | e1831f06eef1 |
| child 2564 | 55e592041076 |
| 2490:6ff82ec1f4b8 | 2491:ffde9eb23f59 |
|---|---|
617 del mf[fn] |
617 del mf[fn] |
618 return mf |
618 return mf |
619 |
619 |
620 modified, added, removed, deleted, unknown, ignored = [],[],[],[],[],[] |
620 modified, added, removed, deleted, unknown, ignored = [],[],[],[],[],[] |
621 compareworking = False |
621 compareworking = False |
622 if not node1 or node1 == self.dirstate.parents()[0]: |
622 if not node1 or (not node2 and node1 == self.dirstate.parents()[0]): |
623 compareworking = True |
623 compareworking = True |
624 |
624 |
625 if not compareworking: |
625 if not compareworking: |
626 # read the manifest from node1 before the manifest from node2, |
626 # read the manifest from node1 before the manifest from node2, |
627 # so that we'll hit the manifest cache if we're going through |
627 # so that we'll hit the manifest cache if we're going through |