From: Frej Drejhammar <frej.drejhammar@gmail.com>
Date: Sat, 20 Dec 2008 18:57:39 +0000 (+0100)
Subject: Merge branch 'from-jmcmullan' into develop
X-Git-Url: http://crossforests.com/gitweb?a=commitdiff_plain;h=276f54c38f12b50c4d44be07e3209d348e348630;p=python%2Ffast-export.git

Merge branch 'from-jmcmullan' into develop

Conflicts:
	hg-fast-export.py
---

276f54c38f12b50c4d44be07e3209d348e348630
diff --cc hg-fast-export.py
index a612801,dd9f179..2b61a0f
--- a/hg-fast-export.py
+++ b/hg-fast-export.py
@@@ -403,8 -418,5 +420,8 @@@ if __name__=='__main__'
    if options.default_branch!=None:
      set_default_branch(options.default_branch)
  
 +  if options.origin_name!=None:
 +    set_origin_name(options.origin_name)
 +
-   sys.exit(hg2git(options.repourl,m,options.marksfile,options.headsfile,
+   sys.exit(hg2git(options.repourl,m,options.marksfile,options.mappingfile,options.headsfile,
      options.statusfile,authors=a,sob=options.sob,force=options.force))