Mercurial > hg > soundsoftware-site

changeset 1549:28cde511f312 feature_1136

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Force flag is needed here
author Chris Cannam
date Tue, 12 Jan 2016 17:32:54 +0000
parents fd4cc11ae096
children 7d825cbd76c8
files extra/soundsoftware/export-git.sh
diffstat 1 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/extra/soundsoftware/export-git.sh	Tue Jan 12 17:32:31 2016 +0000
+++ b/extra/soundsoftware/export-git.sh	Tue Jan 12 17:32:54 2016 +0000
@@ -82,7 +82,14 @@
     
     (
 	cd "$gitrepo"
-	"$fastexport" --quiet -r "$hgrepo" -A "$authormap" --hg-hash
+
+        # Force is necessary because git-fast-import (or git) can't handle
+        # branches having more than one head ("Error: repository has at
+        # least one unnamed head"), which happens from time to time in
+        # valid Hg repos. With --force apparently it will just pick one
+        # of the two heads arbitrarily, which is also alarming but is
+        # more likely to be useful 
+	"$fastexport" --quiet -r "$hgrepo" -A "$authormap" --hg-hash --force
     )
 
     echo "Fast export done"