97 if p1 not in seen and p1 != nullid: |
97 if p1 not in seen and p1 != nullid: |
98 err(lr, _("unknown parent 1 %s of %s") % |
98 err(lr, _("unknown parent 1 %s of %s") % |
99 (short(p1), short(n)), f) |
99 (short(p1), short(n)), f) |
100 if p2 not in seen and p2 != nullid: |
100 if p2 not in seen and p2 != nullid: |
101 err(lr, _("unknown parent 2 %s of %s") % |
101 err(lr, _("unknown parent 2 %s of %s") % |
102 (short(p2), short(p1)), f) |
102 (short(p2), short(n)), f) |
103 except Exception, inst: |
103 except Exception, inst: |
104 exc(lr, _("checking parents of %s") % short(node), inst, f) |
104 exc(lr, _("checking parents of %s") % short(node), inst, f) |
105 |
105 |
106 if node in seen: |
106 if node in seen: |
107 err(lr, _("duplicate revision %d (%d)") % (i, seen[n]), f) |
107 err(lr, _("duplicate revision %d (%d)") % (i, seen[n]), f) |