ZOOKEEPER-2573: Modify Info.REVISION to adapt git repo #155
Conversation
There was a problem hiding this comment.
Thanks, I'm able to merge this pull request to master and branch-3.5.
I just directly tried to apply this to branch-3.4 and got below minor conflicts. Let me try to cherry pick this to branch-3.4 while committing. If I get any conflicts then I will use #137 pull request for branch-3.4
error: patch failed: build.xml:312 error: build.xml: patch does not apply
| rev = -1; | ||
| String rev = args[1]; | ||
| if (rev == null || rev.trim().isEmpty()) { | ||
| rev = "-1"; | ||
| } |
There was a problem hiding this comment.
Else block is missing. Could you add rev.trim() function.
There was a problem hiding this comment.
Oh, really sorry about that. 😞 I squashed the commits from #137, but for whatever reason this latest change didn't make through. 🤔 Well, gonna change now. Thanks for pointing out!
|
Thanks @eribeiro. |
|
Thanks for your patience and support @rakeshadr. Indeed, I tried to Oddly enough, if I apply this patch to master or branch-3.5 ( |
rakeshadr Hi, I have created this PR. The commit can be cherry picked on master too. In fact, I guess when you merge this then #137 will be automatically closed. I tested quickly and was able to cherry-pick this commit on branch-3.4 too, so you may want to give it a try. 😃 Author: Edward Ribeiro <edward.ribeiro@gmail.com> Author: Edward Ribeiro <eribeiro@users.noreply.github.com> Reviewers: Mohammad Arshad <arshad@apache.org>, Michael Han <hanm@apache.org> Closes #155 from eribeiro/ZOOKEEPER-2573-3.5
rakeshadr Hi, I have created this PR. The commit can be cherry picked on master too. In fact, I guess when you merge this then #137 will be automatically closed. I tested quickly and was able to cherry-pick this commit on branch-3.4 too, so you may want to give it a try. 😃 Author: Edward Ribeiro <edward.ribeiro@gmail.com> Author: Edward Ribeiro <eribeiro@users.noreply.github.com> Reviewers: Mohammad Arshad <arshad@apache.org>, Michael Han <hanm@apache.org> Closes #155 from eribeiro/ZOOKEEPER-2573-3.5 (cherry picked from commit 41da3c8) Signed-off-by: Rakesh Radhakrishnan <rakeshr@apache.org>
rakeshadr Hi, I have created this PR. The commit can be cherry picked on master too. In fact, I guess when you merge this then apache#137 will be automatically closed. I tested quickly and was able to cherry-pick this commit on branch-3.4 too, so you may want to give it a try. 😃 Author: Edward Ribeiro <edward.ribeiro@gmail.com> Author: Edward Ribeiro <eribeiro@users.noreply.github.com> Reviewers: Mohammad Arshad <arshad@apache.org>, Michael Han <hanm@apache.org> Closes apache#155 from eribeiro/ZOOKEEPER-2573-3.5 (cherry picked from commit 41da3c8) Signed-off-by: Rakesh Radhakrishnan <rakeshr@apache.org>
rakeshadr Hi, I have created this PR. The commit can be cherry picked on master too. In fact, I guess when you merge this then apache#137 will be automatically closed. I tested quickly and was able to cherry-pick this commit on branch-3.4 too, so you may want to give it a try. 😃 Author: Edward Ribeiro <edward.ribeiro@gmail.com> Author: Edward Ribeiro <eribeiro@users.noreply.github.com> Reviewers: Mohammad Arshad <arshad@apache.org>, Michael Han <hanm@apache.org> Closes apache#155 from eribeiro/ZOOKEEPER-2573-3.5 (cherry picked from commit 41da3c8) Signed-off-by: Rakesh Radhakrishnan <rakeshr@apache.org>
@rakeshadr Hi, I have created this PR. The commit can be cherry picked on master too. In fact, I guess when you merge this then #137 will be automatically closed. I tested quickly and was able to cherry-pick this commit on branch-3.4 too, so you may want to give it a try. 😃