Personally, never tried svn patch. if you have a recent version of gnu patch (i think 2.7+ ? you might have to install from source for some macs, i did), then i tend to just do this:
# for git patches (maybe out of date) patch -p1 --merge < patch.txt # for svn patches (maybe out of date patch -p0 --merge < patch.txt If there are conflicts, you get the normal <<< and >>> stuff rather than .rej files and so on. I use this all the time for applying patches, so that if they are a little out of date I have no hassles. On Tue, Feb 4, 2014 at 4:29 PM, Benson Margulies <[email protected]>wrote: > So, I did: > > wget https://github.com/apache/lucene-solr/pull/18.diff > > and then: > > svn patch --dry-run --strip 1 18.diff > > and some of the pathnames have 2 components stripped -- but not all. > > Has anyone got another approach? I hesitate to use git-svn, but I'll > follow someone else's lead. > > > svn patch --dry-run --strip 1 18.diff > U > solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java > A core > A core/src > A core/src/test-files > A core/src/test-files/solr > A core/src/test-files/solr/analysisconfs > A core/src/test-files/solr/analysisconfs/analysis-err-schema.xml > A solr/core/src/test-files/solr/analysisconfs > A > solr/core/src/test-files/solr/analysisconfs/analysis-err-schema.xml > A core > A core/src > A core/src/test > A core/src/test/org > A core/src/test/org/apache > A core/src/test/org/apache/solr > A core/src/test/org/apache/solr/analysis > A > core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java > A > solr/core/src/test/org/apache/solr/analysis/ThrowingMockTokenFilterFactory.java > A core > A core/src > A core/src/test > A core/src/test/org > A core/src/test/org/apache > A core/src/test/org/apache/solr > A core/src/test/org/apache/solr/update > A > core/src/test/org/apache/solr/update/AnalysisErrorHandlingTest.java > A > solr/core/src/test/org/apache/solr/update/AnalysisErrorHandlingTest.java > > --------------------------------------------------------------------- > To unsubscribe, e-mail: [email protected] > For additional commands, e-mail: [email protected] > >
