Re: apply a patch on solr

2009-11-04 Thread Chris Hostetter
: Thanks, but my question here was not about the patch command itself (which I : already know), but about simpler way (if any) to go about guaranteeing a : proper patch with the right file revisions needed by the patch. as i mentioned before, there is no garuntee that you are patching the exact

Re: apply a patch on solr

2009-11-04 Thread David Stuart
You should be ok with the the revision option below. Look for the highest revision number in the list of files in the patch as subversion increments revision number on a repo basis not a file basis so the highest number will represent the current state of all the files when the patch was ma

Re: apply a patch on solr

2009-11-03 Thread michael8
Thanks, but my question here was not about the patch command itself (which I already know), but about simpler way (if any) to go about guaranteeing a proper patch with the right file revisions needed by the patch. Michael Joe Calderon-2 wrote: > > patch -p0 < /path/to/field-collapse-5.patch >

Re: apply a patch on solr

2009-11-03 Thread Joe Calderon
sorry got cut off, patch, then ant clean dist, will give you the modified solr war file, if it doesnt apply cleanly (which i dont think is currently the case), you can go back to the latest revision referenced in the patch, On Tue, Nov 3, 2009 at 8:17 PM, Joe Calderon wrote: > patch -p0 < /path/

Re: apply a patch on solr

2009-11-03 Thread Joe Calderon
patch -p0 < /path/to/field-collapse-5.patch On Tue, Nov 3, 2009 at 7:48 PM, michael8 wrote: > > Hmmm, perhaps I jumped the gun.  I just looked over the field collapse patch > for SOLR-236 and each file listed in the patch has its own revision #. > > E.g. from field-collapse-5.patch: > --- src/jav

Re: apply a patch on solr

2009-11-03 Thread michael8
Hmmm, perhaps I jumped the gun. I just looked over the field collapse patch for SOLR-236 and each file listed in the patch has its own revision #. E.g. from field-collapse-5.patch: --- src/java/org/apache/solr/core/SolrConfig.java (revision 824364) --- src/solrj/org/apache/solr/client/so

Re: apply a patch on solr

2009-11-03 Thread michael8
Perfect. This is what I need to know instead of patching 'in the dark'. Good thing SVN revision cuts across all files like a tag. Thanks Mike! Michael cambridgemike wrote: > > You can see what revision the patch was written for at the top of the > patch, > it will look like this: > > Index

Re: apply a patch on solr

2009-11-03 Thread Chris Hostetter
: --- org/apache/solr/handler/MoreLikeThisHandler.java (revision 772437) : +++ org/apache/solr/handler/MoreLikeThisHandler.java (working copy) : : now check out revision 772437 using the --revision switch in svn, patch : away, and then svn up to make sure everything merges cleanly. This is a : g

Re: apply a patch on solr

2009-11-02 Thread mike anderson
You can see what revision the patch was written for at the top of the patch, it will look like this: Index: org/apache/solr/handler/MoreLikeThisHandler.java === --- org/apache/solr/handler/MoreLikeThisHandler.java (revision 772437) ++