equal
deleted
inserted
replaced
602 for chunk in revs: |
602 for chunk in revs: |
603 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80]) |
603 node, p1, p2, cs = struct.unpack("20s20s20s20s", chunk[:80]) |
604 link = linkmapper(cs) |
604 link = linkmapper(cs) |
605 if node in self.nodemap: |
605 if node in self.nodemap: |
606 # this can happen if two branches make the same change |
606 # this can happen if two branches make the same change |
607 if unique: |
607 # if unique: |
608 raise RevlogError("already have %s" % hex(node[:4])) |
608 # raise RevlogError("already have %s" % hex(node[:4])) |
609 chain = node |
609 chain = node |
610 continue |
610 continue |
611 delta = chunk[80:] |
611 delta = chunk[80:] |
612 |
612 |
613 if not chain: |
613 if not chain: |