Return-Path: 
 <dev-return-2855-apmail-cassandra-dev-archive=cassandra.apache.org@cassandra.apache.org>
Delivered-To: apmail-cassandra-dev-archive@www.apache.org
Received: (qmail 6543 invoked from network); 27 Nov 2010 20:53:47 -0000
Received: from unknown (HELO mail.apache.org) (140.211.11.3)
  by 140.211.11.9 with SMTP; 27 Nov 2010 20:53:47 -0000
Received: (qmail 79711 invoked by uid 500); 27 Nov 2010 20:53:46 -0000
Delivered-To: apmail-cassandra-dev-archive@cassandra.apache.org
Received: (qmail 79688 invoked by uid 500); 27 Nov 2010 20:53:46 -0000
Mailing-List: contact dev-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:dev-help@cassandra.apache.org>
List-Unsubscribe: <mailto:dev-unsubscribe@cassandra.apache.org>
List-Post: <mailto:dev@cassandra.apache.org>
List-Id: <dev.cassandra.apache.org>
Reply-To: dev@cassandra.apache.org
Delivered-To: mailing list dev@cassandra.apache.org
Received: (qmail 79680 invoked by uid 99); 27 Nov 2010 20:53:46 -0000
Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Nov 2010 20:53:46 +0000
X-ASF-Spam-Status: No, hits=2.2 required=10.0
	tests=FREEMAIL_FROM,HTML_MESSAGE,RCVD_IN_DNSWL_NONE,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL
X-Spam-Check-By: apache.org
Received-SPF: pass (nike.apache.org: domain of simon.reavely@gmail.com
 designates 209.85.216.44 as permitted sender)
Received: from [209.85.216.44] (HELO mail-qw0-f44.google.com) (209.85.216.44)
    by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 27 Nov 2010 20:53:39 +0000
Received: by qwg5 with SMTP id 5so1936933qwg.31
        for <dev@cassandra.apache.org>; Sat, 27 Nov 2010 12:53:18 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:mime-version:received:received:in-reply-to
         :references:date:message-id:subject:from:to:content-type;
        bh=fbBsvaKDMPj0pKdcDnYn1EqBC0RIVtUyxrqU15vLA/E=;
        b=Qms1QBZ8SgHx1kJMVDSux8BoAMbLmI3uAC1aS5n1fEHGT9lkYDZCk42EEgcdjeK4lo
         E3I9yUUjbuey4aCaeZ2M+kcAUOCXhVBEfjxfiyPYMiituqVnUYOCZyLn0Cg8eVwqZ/Ub
         1bZSYBANtWy92fuAGB2xvYk6cbkfzLWz4UyR4=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type;
        b=VHRB0+nXWketh5I4QTQm37hIEZ7kR4h+DtfqvZmW7Ejqx4yoBGxsjAGjiWLXKfqKGy
         zSizckzsX58NzzC6zWHu1J3wgZfRZGiauxW/fLj3fKoG5RlaNkqjW5ul8ct5xO1UeU7+
         MMf57NvPPst36CA5zBReN9rgpPrUvRsAo0gSg=
MIME-Version: 1.0
Received: by 10.224.125.76 with SMTP id x12mr3427754qar.324.1290891198270;
 Sat, 27 Nov 2010 12:53:18 -0800 (PST)
Received: by 10.220.110.145 with HTTP; Sat, 27 Nov 2010 12:53:18 -0800 (PST)
In-Reply-To: <AANLkTi=rOKsk9YZm5NrL_37UyTo4ZqzGfKX8dWCkj+yU@mail.gmail.com>
References: <AANLkTim7F16pn7SqLdqQr9HD38n8vfWsn23S=ECpWsAT@mail.gmail.com>
	<AANLkTi=rOKsk9YZm5NrL_37UyTo4ZqzGfKX8dWCkj+yU@mail.gmail.com>
Date: Sat, 27 Nov 2010 15:53:18 -0500
Message-ID: <AANLkTimP2=SE=R=bWj1juic0acnCzzBK=8+WiMxGbFes@mail.gmail.com>
Subject: Re: Trouble applying 1072 patch
From: Simon Reavely <simon.reavely@gmail.com>
To: dev@cassandra.apache.org
Content-Type: multipart/alternative; boundary=0016364ed17a511ca704960f07df
X-Virus-Checked: Checked by ClamAV on apache.org

--0016364ed17a511ca704960f07df
Content-Type: text/plain; charset=ISO-8859-1

Brilliant thx

For the record of those maybe as rubbish @ git as I am, here is what i did..

1122  git clone https://github.com/kakugawa/cassandra.gitcassandra-1502-to-1072
 1123  cd cassandra-1502-to-1072
 1124  ls
 1125  git branch
 1126  git branch -a
 1127  git checkout remotes/origin/1502-to-1072
 1129  cd interface
 1131  grep Counter *

[reavely@sreavely-svr interface]$ grep Counter *
cassandra.thrift:struct CounterColumn {
cassandra.thrift:struct CounterSuperColumn {
cassandra.thrift:    2: required list<CounterColumn> columns
cassandra.thrift:union Counter {
cassandra.thrift:    1: CounterColumn column,
cassandra.thrift:    2: CounterSuperColumn super_column
cassandra.thrift:struct CounterUpdate {
cassandra.thrift:    1: required CounterColumn counter,
cassandra.thrift:           3:required CounterUpdate update,
cassandra.thrift:  void batch_add(1:required map<binary, map<string,
list<CounterUpdate>>> update_map,
cassandra.thrift:  Counter get_counter(1:required binary key,
cassandra.thrift:  list<Counter> get_counter_slice(1:required binary key,
cassandra.thrift:  map<binary,list<Counter>>
multiget_counter_slice(1:required list<binary> keys,

...


On Fri, Nov 26, 2010 at 1:12 AM, Kelvin Kakugawa <kakugawa@gmail.com> wrote:

> 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.reavely@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...
> >
> > reavely@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
> > [reavely@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.reavely@gmail.com
> >
>



-- 
Simon Reavely
simon.reavely@gmail.com

--0016364ed17a511ca704960f07df--