Author: arielch
Date: Wed May 23 01:30:02 2012
New Revision: 1341709
URL: http://svn.apache.org/viewvc?rev=1341709&view=rev
Log:
Make retrieving the current SVN revision with git-svn work also in BRANCH
The current regular expression only works with a clone of a trunk
repository:
/^\s*git-svn-id:.*?trunk@([0-9]+)\s+/
This fails with the current AOO34 branch:
it does not match trunk@ because it's AOO34@
Modified:
incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm
Modified: incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm
URL:
http://svn.apache.org/viewvc/incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm?rev=1341709&r1=1341708&r2=1341709&view=diff
==============================================================================
--- incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm (original)
+++ incubator/ooo/trunk/main/solenv/bin/modules/SvnRevision.pm Wed May 23
01:30:02 2012
@@ -36,7 +36,7 @@ sub DetectRevisionIdFromGit ($)
# Not in a GIT repository.
last;
}
- elsif (/^\s*git-svn-id:.*?trunk@([0-9]+)\s+/)
+ elsif (/^\s*git-svn-id:.*?@([0-9]+)\s+/)
{
$id = $1;
last;
