From: Rocco Rutte <pdmef@gmx.net>
Date: Tue, 6 Mar 2007 22:11:10 +0000 (+0000)
Subject: Link and not merge first branch of incremental import
X-Git-Url: http://crossforests.com/gitweb?a=commitdiff_plain;h=9ebd965f72da2afd028763bdbd48298bcd5f9db7;p=python%2Ffast-export.git

Link and not merge first branch of incremental import
---

diff --git a/hg2git.py b/hg2git.py
index 076a80e..b00a82e 100644
--- a/hg2git.py
+++ b/hg2git.py
@@ -90,6 +90,9 @@ def export_commit(ui,repo,revision,marks,heads,last,max,count):
     # and kill reference so we won't init it again
     wr('from %s' % src)
     heads[branch]=''
+    sys.stderr.write('Initializing branch [%s] to parent [%s]\n' %
+        (branch,src))
+    link=src # avoid making a merge commit for incremental import
   elif not heads.has_key(branch) and revision>0:
     # newly created branch and not the first one: connect to parent
     tmp=get_parent_mark(parents[0],marks)