Mercurial > hg > pyhgsh

diff mercurial/revlog.py @ 1218:cde6818e082a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add preliminary support for the bundle and unbundle commands
author mpm@selenic.com
date Thu, 08 Sep 2005 01:27:25 -0700
parents 34706a835d4a
children eb3cc5e2eb89
line wrap: on
line diff
--- a/mercurial/revlog.py	Thu Sep 08 00:13:52 2005 -0700
+++ b/mercurial/revlog.py	Thu Sep 08 01:27:25 2005 -0700
@@ -604,8 +604,8 @@
             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]))
+                # if unique:
+                #    raise RevlogError("already have %s" % hex(node[:4]))
                 chain = node
                 continue
             delta = chunk[80:]