equal
deleted
inserted
replaced
35 m2 = repo[parent2].manifest() |
35 m2 = repo[parent2].manifest() |
36 errors = 0 |
36 errors = 0 |
37 |
37 |
38 is_narrow = requirements.NARROW_REQUIREMENT in repo.requirements |
38 is_narrow = requirements.NARROW_REQUIREMENT in repo.requirements |
39 narrow_matcher = repo.narrowmatch() if is_narrow else None |
39 narrow_matcher = repo.narrowmatch() if is_narrow else None |
40 |
40 for err in repo.dirstate.verify(m1, m2, parent1, narrow_matcher): |
41 for err in repo.dirstate.verify(m1, m2, narrow_matcher): |
|
42 ui.warn(err[0] % err[1:]) |
41 ui.warn(err[0] % err[1:]) |
43 errors += 1 |
42 errors += 1 |
44 |
43 |
45 return errors |
44 return errors |
46 |
45 |