By the way, you can try https://github.com/griddynamics/solr-fork/tree/trunk-patched which contains SOLR-3076. Note: it is not the latest trunk, we rebase(in terms of git) it from time to time - the latest rebase was at 18 Feb 2013
On Thu, May 16, 2013 at 7:01 PM, Tom Burton-West <[email protected]> wrote: > Thanks Shawn and Vadim, > > I'll try the July patch against r1351040 of 4_x for now. > Vadim, I'm in no hurry, but I'll watch 3076 for your patch and work with > that when you post it. > > > Tom > > > On Thu, May 16, 2013 at 2:14 AM, Vadim Kirilchuk < > [email protected]> wrote: > >> Hi, >> >> As far as i know, patch from 16/Jul/12 was created for branch 4.x, and >> SOLR-3076-childDocs.patch<https://issues.apache.org/jira/secure/attachment/12548872/SOLR-3076-childDocs.patch> >> from 12/Oct/12 is a little bit reworked SOLR-3076 (for branch 4.x too). >> >> However, they may be not up to date even for 4.x, because of trunk back >> merges (i'am not sure). >> >> Also as mentioned by Shawn, you should use p1 instead of p0. >> >> P/s actually i have reworked version for trunk, i can post it in a week >> if you need. >> >> On Thu, May 16, 2013 at 3:46 AM, Shawn Heisey <[email protected]> wrote: >> >>> On 5/15/2013 5:42 PM, Shawn Heisey wrote: >>> >>>> Through a little detective work, I figured out that it would apply >>>> cleanly to revision 1351040 of trunk. When I then tried to do 'svn up' >>>> to bring the tree current, there were merge conflicts that will have to >>>> be manually fixed. >>>> >>> >>> It applied also to that revision of branch_4x, and I think there were >>> fewer merge conflicts there, too. It looks like you want 4x, so that's >>> probably a good thing. >>> >>> >>> Thanks, >>> Shawn >>> >>> >>> ------------------------------**------------------------------** >>> --------- >>> To unsubscribe, e-mail: >>> [email protected].**org<[email protected]> >>> For additional commands, e-mail: [email protected] >>> >>> >> >
