Mercurial > hg > hg-fastimport

changeset 43:000d4174071c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't blow up if first parent == second parent. cvs2git produces this on purpose, and git-fast-import handles it. (backout changeset a1ccf1817b65)
author Greg Ward <greg-hg@gerg.ca>
date Mon, 11 May 2009 13:59:20 -0400
parents 71f1e5ed6213
children 61ff7b929cea
files hgfastimport/hgimport.py
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/hgfastimport/hgimport.py	Sun May 10 12:00:23 2009 -0400
+++ b/hgfastimport/hgimport.py	Mon May 11 13:59:20 2009 -0400
@@ -130,11 +130,6 @@
                 raise NotImplementedError("Can't handle more than two parents")
             second_parent = self.committish_rev(cmd.merges[0])
             #self.ui.write("Second parent: %s\n" % second_parent)
-            if second_parent == first_parent:
-                raise util.Abort("bad fastimport dump: commit %s has %s as "
-                                 "both parents"
-                                 % (cmd.id, cmd.merges[0]))
-
             mercurial.commands.debugsetparents(self.ui, self.repo, 
                 first_parent, second_parent)
         #self.ui.write("Bing\n")