# HG changeset patch
# User Greg Ward <greg-hg@gerg.ca>
# Date 1242064760 14400
# Node ID 000d4174071c096eea7880e049d6c8b6e1236b50
# Parent  71f1e5ed621305f17d7611914d887c9dd5395853
Don't blow up if first parent == second parent.
cvs2git produces this on purpose, and git-fast-import handles it.
(backout changeset a1ccf1817b65)

diff -r 71f1e5ed6213 -r 000d4174071c hgfastimport/hgimport.py
--- 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")