Hi Simon, Would you be able to use this git branch: https://github.com/kakugawa/cassandra/tree/1502-to-1072
It's the most up-to-date version and you won't have to fool around w/ applying a patch. Since, to apply the patch, your repo has to be at the same commit (in trunk) that I cut it from. (It's not very fun to hunt through the commits in trunk to find that magic commit.) -Kelvin On Thu, Nov 25, 2010 at 9:28 PM, Simon Reavely <simon.reav...@gmail.com> wrote: > Hi, > > I'm trying to apply the latest patch from > https://issues.apache.org/jira/browse/CASSANDRA-1072 and I'm hitting > issues... > > Since I don't usually use git (I'm a svn guy) and I've never applied a patch > with git before I'm not sure if I doing something hideous.. > > See below... > > reav...@sreavely-svr cassandra]$ ls > bin CASSANDRA-1072.112210.patch CHANGES.txt contrib doc > increment_test.py ivysettings.xml lib NEWS.txt README.txt > src > build.xml CASSANDRA-1072.patch conf debian drivers > interface ivy.xml LICENSE.txt NOTICE.txt redhat > test > [reav...@sreavely-svr cassandra]$ git apply ./CASSANDRA-1072.112210.patch > ./CASSANDRA-1072.112210.patch:226: trailing whitespace. > > ./CASSANDRA-1072.112210.patch:254: trailing whitespace. > 2:required ColumnParent column_parent, > ./CASSANDRA-1072.112210.patch:255: trailing whitespace. > 3:required SlicePredicate predicate, > ./CASSANDRA-1072.112210.patch:258: trailing whitespace. > > ./CASSANDRA-1072.112210.patch:264: trailing whitespace. > 3:required SlicePredicate > predicate, > error: patch failed: conf/cassandra.yaml:369 > error: conf/cassandra.yaml: patch does not apply > error: patch failed: src/java/org/apache/cassandra/concurrent/Stage.java:31 > error: src/java/org/apache/cassandra/concurrent/Stage.java: patch does not > apply > error: patch failed: > src/java/org/apache/cassandra/config/CFMetaData.java:733 > error: src/java/org/apache/cassandra/config/CFMetaData.java: patch does not > apply > error: patch failed: > test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java:1 > error: test/unit/org/apache/cassandra/service/AntiEntropyServiceTest.java: > patch does not apply > > Any help greatly appreciated! > > -- > Simon Reavely > simon.reav...@gmail.com >
