Merge branch 'from-jmcmullan' into develop
authorFrej Drejhammar <frej.drejhammar@gmail.com>
Sat, 20 Dec 2008 18:57:39 +0000 (19:57 +0100)
committerFrej Drejhammar <frej.drejhammar@gmail.com>
Sat, 20 Dec 2008 18:57:39 +0000 (19:57 +0100)
Conflicts:
hg-fast-export.py

1  2 
hg-fast-export.py
hg-fast-export.sh
hg-reset.py
hg-reset.sh

@@@ -403,8 -418,5 +420,8 @@@ if __name__=='__main__'
    if options.default_branch!=None:
      set_default_branch(options.default_branch)
  
-   sys.exit(hg2git(options.repourl,m,options.marksfile,options.headsfile,
 +  if options.origin_name!=None:
 +    set_origin_name(options.origin_name)
 +
+   sys.exit(hg2git(options.repourl,m,options.marksfile,options.mappingfile,options.headsfile,
      options.statusfile,authors=a,sob=options.sob,force=options.force))
Simple merge
diff --cc hg-reset.py
Simple merge
diff --cc hg-reset.sh
Simple merge