Show More
@@ -1540,7 +1540,7 b' class dirstate:' | |||
|
1540 | 1540 | if data_backup is not None: |
|
1541 | 1541 | o.unlink(data_backup[0]) |
|
1542 | 1542 | |
|
1543 | def verify(self, m1, m2): | |
|
1543 | def verify(self, m1, m2, narrow_matcher=None): | |
|
1544 | 1544 | """check the dirstate content again the parent manifest and yield errors""" |
|
1545 | 1545 | missing_from_p1 = b"%s in state %s, but not in manifest1\n" |
|
1546 | 1546 | unexpected_in_p1 = b"%s in state %s, but also in manifest1\n" |
@@ -1556,6 +1556,8 b' class dirstate:' | |||
|
1556 | 1556 | if entry.added and f in m1: |
|
1557 | 1557 | yield (unexpected_in_p1, f, state) |
|
1558 | 1558 | for f in m1: |
|
1559 | if narrow_matcher is not None and not narrow_matcher(f): | |
|
1560 | continue | |
|
1559 | 1561 | entry = self.get_entry(f) |
|
1560 | 1562 | if not entry.p1_tracked: |
|
1561 | 1563 | yield (missing_from_ds, f, entry.state) |
General Comments 0
You need to be logged in to leave comments.
Login now