Here's a patch for this. The problem was that branches/upstream already exists in the repo, so importing that directory won't work. Instead, it has to import branches/upstream/<package>.
I also chose to make it svn mkdir branches/upstream, in case it didn't exist yet. Only problem with that is there are some ugly messages if it does exist. This could be improved by only creating the directories if they don't already exist. Anyhow, patch works, and attached. -- see shy jo
--- /usr/bin/svn-inject 2007-06-09 12:12:31.000000000 -0400
+++ svn-inject 2007-07-26 19:16:11.000000000 -0400
@@ -255,12 +255,15 @@
$SDCommon::c{"tagsUrl"}="$opt_svnurl/tags/$package";
$SDCommon::c{"upsCurrentUrl"}="$opt_svnurl/branches/upstream/$package/current";
$SDCommon::c{"upsTagUrl"}="$opt_svnurl/branches/upstream/$package";
+
+ withechoNoPrompt ("svn", "mkdir", "$opt_svnurl/branches", "-m", "create branches directory");
+ withechoNoPrompt ("svn", "mkdir", "$opt_svnurl/branches/upstream", "-m", "create branches/upstream directory");
}
#withecho "svn $opt_svnquiet import -m\"$scriptname Installing original source of $package\" $package $opt_svnurl/$package";
withecho ("svn", $opt_svnquiet, "import", "-m", "$scriptname Installing original source of $package",
- ($opt_layout==2) ? (".", $opt_svnurl) : ($package, "$opt_svnurl/$package"));
+ ($opt_layout==2) ? ("branches/upstream", "$opt_svnurl/branches/upstream") : ($package, "$opt_svnurl/$package"));
}
signature.asc
Description: Digital signature
