summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorColin Guthrie <colin@mageia.org>2013-08-25 17:32:54 +0100
committerColin Guthrie <colin@mageia.org>2013-08-25 17:32:54 +0100
commita24a1dcc890d767a9fe45d7f5354c7df6a45515c (patch)
tree3bd8af4001fcbcb4b5f95bd501c355d1f585407f
parentc63821c5d4fa0b7e4c92e1ec2154034730d223b3 (diff)
downloadsvn-git-migration-a24a1dcc890d767a9fe45d7f5354c7df6a45515c.tar
svn-git-migration-a24a1dcc890d767a9fe45d7f5354c7df6a45515c.tar.gz
svn-git-migration-a24a1dcc890d767a9fe45d7f5354c7df6a45515c.tar.bz2
svn-git-migration-a24a1dcc890d767a9fe45d7f5354c7df6a45515c.tar.xz
svn-git-migration-a24a1dcc890d767a9fe45d7f5354c7df6a45515c.zip
Support imports where there is no stdlayoutHEADmaster
-rwxr-xr-xscripts/mandriva-svn2git.sh6
1 files changed, 5 insertions, 1 deletions
diff --git a/scripts/mandriva-svn2git.sh b/scripts/mandriva-svn2git.sh
index e07127a..bd08776 100755
--- a/scripts/mandriva-svn2git.sh
+++ b/scripts/mandriva-svn2git.sh
@@ -19,7 +19,11 @@ if [ -n "$skiprevisionsx" ]; then
fi
# STEP 2: Import in git
-git svn init http://svn.mandriva.com/svn/soft/$SOFTWARE --no-metadata --stdlayout temp
+STDLAYOUT=--stdlayout
+if [ "$(svn ls http://svn.mandriva.com/svn/soft/$SOFTWARE/trunk 2>/dev/null | wc -l)" == "0" ]; then
+ STDLAYOUT=
+fi
+git svn init http://svn.mandriva.com/svn/soft/$SOFTWARE --no-metadata $STDLAYOUT temp
cd temp
revision=0
if [ -n "$skiprevisions" ]; then