tags 443860 + patch thanks On Fri, 2010-08-13 at 21:09 -0500, Peter Samuelson wrote: > [Arthur de Jong] > > It may be a good idea to upgrade svn2cl in subversion-tools to 0.12. > > Yeah, I really should. Too bad you didn't mention this two or three > weeks ago, could've gotten that into squeeze.
Yeah, sorry. Didn't get around to looking at svn2cl for some time.
> Alternatively - it occurs to me that svn2cl is a fairly independent
> project, even though we ship it in Subversion contrib. If you'd like
> to upload it as its own source package, I'd be happy to cooperate on
> the subversion-tools side to ensure a smooth transition for the users.
> This may be a good long-term plan anyway, given upstream will no longer
> distribute contrib in the tarball in 1.7.
That does sound like a good idea. Since Subversion switched to Apache,
they also require copyright assignment (at least from what I understand)
and having svn2cl in Subversion itself didn't improve svn2cl.
Anyway, regarding this bug report, the patch for adding
--non-interactive would be:
Index: svn2cl.sh
===================================================================
--- svn2cl.sh (revision 126)
+++ svn2cl.sh (revision 127)
@@ -51,7 +51,7 @@
CHANGELOG=""
OUTSTYLE="cl"
SVNLOGCMD="svn --verbose --xml log"
-SVNINFOCMD="svn info"
+SVNINFOCMD="svn --non-interactive info"
AUTHORSFILE=""
IGNORE_MESSAGE_STARTING=""
TITLE="ChangeLog"
To not hide errors from the svn info command in 0.12 contains this
change (just the removal of "2> /dev/null"):
Index: svn2cl.sh
===================================================================
--- svn2cl.sh (revision 126)
+++ svn2cl.sh (revision 127)
@@ -298,7 +298,7 @@
# try to determin a prefix to strip from all paths
if [ "$STRIPPREFIX" = "AUTOMATICALLY-DETERMINED" ]
then
- STRIPPREFIX=`LANG=C eval "$SVNINFOCMD" 2> /dev/null | $AWK '/^URL:/{url=$2}
/^Repository Root:/{root=$3} E
+ STRIPPREFIX=`LANG=C eval "$SVNINFOCMD" | $AWK '/^URL:/{url=$2} /^Repository
Root:/{root=$3} END{if(root){p
STRIPPREFIX=`echo "$STRIPPREFIX" | sed 's/%20/ /g'`
fi
Both changes are rather minimal and have been in use in svn2cl since
October 2009.
--
-- arthur - adej...@debian.org - http://people.debian.org/~adejong --
signature.asc
Description: This is a digitally signed message part
