--- a/mercurial/revlog.py Tue Jun 03 09:34:14 2008 +0200
+++ b/mercurial/revlog.py Thu Jun 05 16:25:11 2008 +0200
@@ -1133,7 +1133,7 @@
yield changegroup.closechunk()
- def addgroup(self, revs, linkmapper, transaction, unique=0):
+ def addgroup(self, revs, linkmapper, transaction):
"""
add a delta group
@@ -1170,8 +1170,6 @@
link = linkmapper(cs)
if node in self.nodemap:
# this can happen if two branches make the same change
- # if unique:
- # raise RevlogError(_("already have %s") % hex(node[:4]))
chain = node
continue
delta = buffer(chunk, 80)