# HG changeset patch # User Chris Cannam # Date 1452619974 0 # Node ID 28cde511f31295397089f54a29d420fc479cf552 # Parent fd4cc11ae096f46e4b5426dfbbd2a9a378ae2dd8 Force flag is needed here diff -r fd4cc11ae096 -r 28cde511f312 extra/soundsoftware/export-git.sh --- 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"