Mailing-List: contact dev-help@cassandra.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@cassandra.apache.org
Received-SPF: pass (athena.apache.org: domain of tedoc2000@gmail.com
 designates 209.85.210.172 as permitted sender)
Message-ID: <4F05DCFE.6080704@gmail.com>
Date: Thu, 05 Jan 2012 09:25:18 -0800
From: Ted Crossman <tedoc2000@gmail.com>
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7;
 rv:8.0) Gecko/20111105 Thunderbird/8.0
MIME-Version: 1.0
To: dev@cassandra.apache.org
CC: Jonathan Ellis <jbellis@gmail.com>
Subject: Re: Cassandra has moved to Git
References: 
 <CAL35Oi3WLPceWRWy_z0xR8QbQ8nBQqkgxAxLUCWYWaENAZ6miA@mail.gmail.com>
 <CAJG-trovP_n_FcLLrd_7CeC4vW2DFVYvUB0kg+g7qfbRFxxe9Q@mail.gmail.com>
 <CALdd-zj7WpkGz+aYQO7A7q-tHZUSREx_5tjcL_azLgsT1bQS4Q@mail.gmail.com>
 <CAL35Oi0t5uJ3aZA9EsUpWR7JOjJtoEnCXON_9S-0VYKYjYzLdg@mail.gmail.com>
 <CAJG-trpWJmo_ROnptaJTF8kRaT1HjBdZRvekYpSjkEY7SsHkPQ@mail.gmail.com>
 <CALdd-zisdwgUuSd=8s8WrJEe-oOpgBjStvSV4VCr4bgbOo5kiQ@mail.gmail.com>
 <CAO5xsd1hzA5Mm-_6-GTgBAS3-6gSXf4Y_NTbo81eayix6Z4DKg@mail.gmail.com>
 <CAO5xsd0TKcSSrPK5EgXovAk=zgCi7tOcm6P=YDHQzx68g-jEzw@mail.gmail.com>
 <CAKkz8Q2Lo9Z=E7O0Z6sdAETh_L+8ZE8g1uVURuxfzFBOsZhzQQ@mail.gmail.com>
 <CAKkz8Q3rKGe-Q4cAaAU98AUPwT9SrsUnJOW1Cr=pkb8KxJN4Ug@mail.gmail.com>
 <CAKkz8Q2FQ8ZLyTKUP9jktiFPmiauVKTjCQn=VMPU3C1tHAAzog@mail.gmail.com>
 <CAL35Oi0SUU=0O+M33p5Lhp2AcpLE-fHt1BpVKXjbJOLxEN-ezQ@mail.gmail.com>
 <CAKkz8Q2RY7UNEQsmMPdre-A7RH3gtdOeq0VnKpdqpSr8ESSrMg@mail.gmail.com>
 <CALdd-zgWR0J-UuXt=z_0bMqoCu6eN61cc0-j_nJC6hg3PWugSw@mail.gmail.com>
In-Reply-To: 
 <CALdd-zgWR0J-UuXt=z_0bMqoCu6eN61cc0-j_nJC6hg3PWugSw@mail.gmail.com>
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit

On 1/5/12 9:06 AM, Jonathan Ellis wrote:
> On Thu, Jan 5, 2012 at 10:58 AM, Sylvain Lebresne<sylvain@datastax.com>  wrote:
>> Again, I was more talking about the only reasonable solution I saw.
>> Because to be clear, if the history for some issue 666 in say trunk looks like:
>>
>> commit eeee: last nits from reviewer
>> commit dddd: oops, typo that prevented commit
>> commit cccc: some more fix found during review
>> commit bbbb: refactor half of preceding patch following reviewer comments
>> commit aaaa: Do something awesome - patch for #666
> Don't forget
>
> commit ffff:<merge>  (i.e., resolve conflicts introduced in master post-branch)
>
>> So basically my question is how do we meld all those commits that will
>> necessarily happen due to the nature of distributed reviews so that our
>> main history don't look like shit? And if the answer is "we don't" then
>> I'm not too fond of that solution.
> +1
>
One thing to consider is something like gerrit which allow code reviews 
before you submit to "trunk".

Either way if you work on a branch separate branch form "trunk" you can 
publish changes for people to review.
If they have a nit. You fix it *in the same commit* using git commit 
--amend.

Step # 1: Issue fixer
git checkout -b issue666 origin/trunk
*hack hack*
git commit -a
Send e-mail to reviewers telling them to do pull.

Step #2: Reviewer:
git checkout -b issue666
git pull <person submitting code's git url> issue666
* review review*
* Send e-mail to issue fixer pointing out stuff*

Step #3: Issue fixer
*fix pointed out stuff*
git commit --amend
*Send out email "I've fixed it please review again"

Step #4: Reviewer
git checkout issue666 # assuming they have been working on something else
git reset --hard HEAD^1 # this will get you back to the state before you 
pulled issue666
git pull <person submitting code's git url> issue666
* review review*
* Send e-mail to issue fixer pointing out stuff*

You can do steps #3 and #4 as many times as necessary.

Once everyone is happy, either one of the reviewers or the issue fixer can:
git checkout trunk
git rebase issue666

Also if trunk moves along during the review process the issue creator 
can just:
git checkout issue666
git rebase trunk

and then send things for review again.

Gerrit makes a lot of the "send e-mail to pull" and "send e-mail 
pointing stuff out" a lot easier.


HTH,

tedo