equal
deleted
inserted
replaced
48 if node in self.nodemap: |
48 if node in self.nodemap: |
49 prev = node |
49 prev = node |
50 continue |
50 continue |
51 for p in (p1, p2): |
51 for p in (p1, p2): |
52 if not p in self.nodemap: |
52 if not p in self.nodemap: |
53 raise error.LookupError(p1, self.indexfile, |
53 raise error.LookupError(p, self.indexfile, |
54 _("unknown parent")) |
54 _("unknown parent")) |
55 if linkmapper is None: |
55 if linkmapper is None: |
56 link = n |
56 link = n |
57 else: |
57 else: |
58 link = linkmapper(cs) |
58 link = linkmapper(cs) |