equal
deleted
inserted
replaced
557 parent1, parent2 = repo.dirstate.parents() |
557 parent1, parent2 = repo.dirstate.parents() |
558 m1 = repo[parent1].manifest() |
558 m1 = repo[parent1].manifest() |
559 m2 = repo[parent2].manifest() |
559 m2 = repo[parent2].manifest() |
560 errors = 0 |
560 errors = 0 |
561 for err in repo.dirstate.verify(m1, m2): |
561 for err in repo.dirstate.verify(m1, m2): |
562 ui.warn(err[0] % err[1:]) |
562 ui.warn(err) |
563 errors += 1 |
563 errors += 1 |
564 if errors: |
564 if errors: |
565 errstr = _(b".hg/dirstate inconsistent with current parent's manifest") |
565 errstr = _(b".hg/dirstate inconsistent with current parent's manifest") |
566 raise error.Abort(errstr) |
566 raise error.Abort(errstr) |
567 |
567 |