[Ocfs2-commits] jlbec commits r2982 - branches/ocfs2-1.2
svn-commits at oss.oracle.com
svn-commits at oss.oracle.com
Fri Feb 9 11:45:44 PST 2007
Author: jlbec
Date: 2007-02-09 11:45:44 -0800 (Fri, 09 Feb 2007)
New Revision: 2982
Modified:
branches/ocfs2-1.2/svnrev.guess
Log:
Get updated svnrev.guess from the oracleasm tree. This version can handle
the new svn log format as well as handle a bogus svn status version.
Signed-off-by: mfasheh
Modified: branches/ocfs2-1.2/svnrev.guess
===================================================================
--- branches/ocfs2-1.2/svnrev.guess 2007-02-01 19:45:23 UTC (rev 2981)
+++ branches/ocfs2-1.2/svnrev.guess 2007-02-09 19:45:44 UTC (rev 2982)
@@ -33,7 +33,8 @@
then
return
fi
- svn stat -v | awk 'BEGIN{modified = "false";lastrev = 0}
+ svn stat -v | awk 'BEGIN{modified = "false";lastrev = ""}
+ {if (lastrev == ""){lastrev = 0}}
/Status against/{next}
/^\?/{next}
{
@@ -88,10 +89,12 @@
{
BRANCH="$1"
BRANCH_SEARCH="`echo "$BRANCH" | sed -e 's/\//\\\\\//g'`"
- svn log -v | awk 'BEGIN{rev=0}
- /^r[0-9]+ \|/{rev += 1}
- /^ +A \/'"$BRANCH_SEARCH"'$/{exit}
- END{print rev}'
+ svn log -v 2>&1 |
+ awk 'BEGIN{rev=0}
+ /^r[0-9]+ \|/{rev += 1}
+ /^ +A \/'"$BRANCH_SEARCH"'$/{exit}
+ /^ +A \/'"$BRANCH_SEARCH"' (.*)$/{exit}
+ END{print rev}'
}
More information about the Ocfs2-commits
mailing list