[
https://issues.apache.org/jira/browse/HBASE-2590?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=12870356#action_12870356
]
stack commented on HBASE-2590:
------------------------------
If I diff git and svn I see no difference.
git
* trunk 5fc7f69 HBASE-2598 Move
NINES and ZEROS to client package and change visibility to default
svn
$ svn info
Path: .
URL: https://svn.apache.org/repos/asf/hbase/trunk
Repository Root: https://svn.apache.org/repos/asf
Repository UUID: 13f79535-47bb-0310-9956-ffa450edef68
Revision: 947358
Node Kind: directory
Schedule: normal
Last Changed Author: stack
Last Changed Rev: 947349
Last Changed Date: 2010-05-22 16:38:16 -0700 (Sat, 22 May 2010)
$ diff src/saveVersion.sh ../hbase/src/saveVersion.sh emits nothing
The committed file seems to work. Here is its product:
{code}
~/hbase$ more
target/generated-sources/org/apache/hadoop/hbase/package-info.java
/*
* Generated by src/saveVersion.sh
*/
@VersionAnnotation(version="0.21.0-SNAPSHOT",
revision="5fc7f694d9f979ae7b044f3abc8bca2cd05c54af",
user="stack", date="Sat May 22 22:27:35 PDT 2010",
url="git://face/home/stack/hbase")
{code}
I had to commit this though to make the REVSION work again for git:
{code}
$ git diff !$
git diff src/saveVersion.sh
diff --git a/src/saveVersion.sh b/src/saveVersion.sh
index 73778b4..9607daa 100755
--- a/src/saveVersion.sh
+++ b/src/saveVersion.sh
@@ -31,7 +31,7 @@ cwd=`pwd`
if [ -d .svn ]; then
revision=`svn info | sed -n -e 's/Last Changed Rev: \(.*\)/\1/p'`
url=`svn info | sed -n -e 's/URL: \(.*\)/\1/p'`
-elif [ -d ../.git ]; then
+elif [ -d .git ]; then
revision=`git log -1 --pretty=format:"%H"`
hostname=`hostname`
url="git://${hostname}${cwd}"
{code}
Does your patch even work Benoit?
> Failed parse of branch element in saveVersion.sh
> ------------------------------------------------
>
> Key: HBASE-2590
> URL: https://issues.apache.org/jira/browse/HBASE-2590
> Project: Hadoop HBase
> Issue Type: Bug
> Reporter: stack
> Assignee: Benoit Sigoure
> Fix For: 0.21.0
>
> Attachments: 0001-Fix-HBASE-2590.patch
>
>
> A mvn build would fail because of the string it was getting back from svn:
> {code}
> [exec] not part of the command.
> Execute:Java13CommandLauncher: Executing 'sh' with arguments:
> '/home/X/Y/hadoop/branches/V.V/hbase/hbase-trunk/src/saveVersion.sh'
> '0.21.0-SNAPSHOT'
> '/home/X/Y/hadoop/branches/V.V/hbase-trunk/target/generated-sources'
> The ' characters around the executable and arguments are
> not part of the command.
> [exec] sed: -e expression #6, char 48: unterminated `s' command
> [exec] Result: 1
> {code}
> Path amended in the above to protect the innocent.
> The failure was around parse of branch. Branch is not used.
--
This message is automatically generated by JIRA.
-
You can reply to this email to add a comment to the issue online.