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