@@ -245,10 +245,37 @@ --rename-master trunk \ --export-marks $gitdir/fossil.marks \ $=importmarks_fossil \ $repo } + + fl2git() { + if [ -n "$1" ]; then + local gitdir="$1/.git" + else + local gitdir=$(git rev-parse --show-toplevel)/.git + fi + + [ -f "$gitdir/git.marks" ] && + local importmarks_git="--import-marks=$gitdir/git.marks" + + if [ -f "$gitdir/fossil.marks" ]; then + local incremental="--incremental" + local importmarks_fossil + importmarks_fossil="--import-marks $gitdir/fossil.marks" + fi + + LC_ALL=C fossil export \ + --git \ + $=incremental \ + --rename-trunk master \ + --export-marks $gitdir/fossil.marks \ + $=importmarks_fossil | + LC_ALL=C git fast-import \ + --export-marks=$gitdir/git.marks \ + $=importmarks_git + } fi # pkgsrc does not like MAKEFLAGS including -j which pkg_chk &>/dev/null && alias pkg_chk="MAKEFLAGS= pkg_chk" which pkg_rolling-replace &>/dev/null &&