Hi Varun. Since I know we've been collaborating on GitHub, can you create a branch, apply the change (both of which you probably have already) and send a pull request upstream referencing this issue ID in the title? For some odd reason I can't apply your patch but it's not clear it's a problem with the patch or user-error on my part. FYI when patches are attached to issues, they are named "LUCENE-5825 optionalcomment.patch"

David Smiley
added a comment - 18/Jul/14 15:31 Hi Varun. Since I know we've been collaborating on GitHub, can you create a branch, apply the change (both of which you probably have already) and send a pull request upstream referencing this issue ID in the title? For some odd reason I can't apply your patch but it's not clear it's a problem with the patch or user-error on my part. FYI when patches are attached to issues, they are named " LUCENE-5825 optionalcomment.patch"

ASF GitHub Bot
added a comment - 22/Jul/14 05:07 Github user dsmiley commented on the pull request:
https://github.com/apache/lucene-solr/pull/65#issuecomment-49698795
Awesome. Please create a patch and attach the the JIRA issue (and name the patch as I indicated in the comments of the JIRA issue). And please share the git command-line you use to do it; I'm curious.

I have attached the patch and the command line I had used for creating the patch earlier was "git diff trunk lucene-5825". For the patch that I uploaded now, has been created using the command "git format-patch trunk --stdout > patchFile"

Varun V Shenoy
added a comment - 22/Jul/14 18:11 I have attached the patch and the command line I had used for creating the patch earlier was "git diff trunk lucene-5825". For the patch that I uploaded now, has been created using the command "git format-patch trunk --stdout > patchFile"

I think the earlier patch was probably generated OK. The new one you posted is definitely wrong as it only includes your last commit – most likely because you've been merging trunk into your branch (please don't do that next time). I generated a diff this way:git diff --no-prefix --no-color origin/trunk...shenoy/lucene-5825 – lucene/benchmark/ > LUCENE-5825.patch

--no-prefix: chops off the a/ & b/ git does by default on the paths.

--no-color when I redirected stdout to a file it included the color codes which rendered the file corrupt. I don't remember having to set this in the past, but whatever.

-- lucene/benchmark: I think because you merged trunk, it included stuff outside of the benchmark module, so this filtered it.

David Smiley
added a comment - 23/Jul/14 04:41 I think the earlier patch was probably generated OK. The new one you posted is definitely wrong as it only includes your last commit – most likely because you've been merging trunk into your branch (please don't do that next time). I generated a diff this way:
git diff --no-prefix --no-color origin/trunk...shenoy/lucene-5825 – lucene/benchmark/ > LUCENE-5825 .patch
--no-prefix: chops off the a/ & b/ git does by default on the paths.
--no-color when I redirected stdout to a file it included the color codes which rendered the file corrupt. I don't remember having to set this in the past, but whatever.
-- lucene/benchmark: I think because you merged trunk, it included stuff outside of the benchmark module, so this filtered it.
IntelliJ at least applied this patch fine.
I'll commit in a sec.