[ https://issues.apache.org/jira/browse/ZOOKEEPER-2573?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15837567#comment-15837567 ]
ASF GitHub Bot commented on ZOOKEEPER-2573: ------------------------------------------- Github user eribeiro commented on the issue: https://github.com/apache/zookeeper/pull/155 Thanks for your patience and support @rakeshadr. Indeed, I tried to `git apply` the patch: https://github.com/apache/zookeeper/pull/155.diff on branch-3.4 and it failed as you wrote before. :disappointed: **Oddly enough**, if I apply this patch to master or branch-3.5 (`git apply 155.diff`) then switched to branch-3.4 the did a `git cherry-pick <commit>` and it worked. But I am suspicious if this was okay (I did a quick test here now). > Modify Info.REVISION to adapt git repo > -------------------------------------- > > Key: ZOOKEEPER-2573 > URL: https://issues.apache.org/jira/browse/ZOOKEEPER-2573 > Project: ZooKeeper > Issue Type: Bug > Components: build, server > Affects Versions: 3.4.9, 3.5.2 > Reporter: Mohammad Arshad > Assignee: Edward Ribeiro > Fix For: 3.4.10, 3.5.3, 3.6.0 > > > Modify {{org.apache.zookeeper.version.Info.REVISION}} to store git repo > revision > Currently {{org.apache.zookeeper.version.Info.REVISION}} stores the svn repo > revision which is of type int > But after migrating to git repo the git repo's revision(commit > 63f5132716c08b3d8f18993bf98eb46eb42f80fb) can not be stored in this variable. > So either we should modify this variable to string to introduce new variable > to store the git revision and leave the svn revision variable unchanged. > build.xml, and org.apache.zookeeper.version.util.VerGen also need to be > modified. -- This message was sent by Atlassian JIRA (v6.3.4#6332)