[vtk-developers] KdTree FindPointsWithinRadius

[pat marion]

In order to squash everything into two commits I'd probably just do a 'git
reset xxxxx' where xxxxx is the hash of the commit that your work is based
on.  This will undo all your commits, but leave your changes in the working
tree.  Now just git add the vtk files, commit, git add the test files,
commit.

Linking to github's diff view probably works as well or better than
attaching patches.  In your email I only found a link to your repo url and
branch name though.  I fetched it to look at the diff.  I guess I'd find it
most convenient to have diffs attached to the email (for small changes) and
a link to the repo for those motivated to take a closer look.

Pat


On Thu, Sep 23, 2010 at 2:42 PM, David Doria <daviddoria at gmail.com> wrote:

> On Wed, Sep 22, 2010 at 10:45 AM, pat marion <pat.marion at kitware.com>
> wrote:
> > Are you talking about pushing your commits 26d55f7a59 thru bb4b221faf2?
> My
> > opinion is that these commits are not ready to be pushed, but I have not
> had
> > a lot of time to do a proper review.  For ease of reviewing, I'd
> recommend
> > squashing all your commits into two- the first commit performs adds your
> new
> > feature, the second commit that adds the tests.  Then use git
> format-patch
> > and attach the commits to the mailing list.
> >
> > Pat
>
> Yes, those are the commits. I did some reading about squashing etc. I
> see how to combine commits, but I don't know how to separate commits.
> That is, in most of the commits I worked on the implementation as well
> as the test. How would I break these apart?
>
> Also, why would you want to use git format-patch? Isn't github's
> interface exactly for this type of review? And the idea of publishing
> a branch instead of just the files is that a review can clone the
> branch and try everything out right away, right? And githubs red/green
> highlighted lines as well as displaying individual files also solves
> the problem of having the test and the implementation in the same
> commit, right?
>
> It just look to me like this process of preparing the code for a
> review will take just as much time as writing these tiny patches. Is
> this the "agreed upon" procedure? I know ITK has been using Gerrit and
> I know we're not there yet, but would most people know what to do with
> a git format-patch email?
>
> David
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://public.kitware.com/pipermail/vtk-developers/attachments/20100923/9cf6ba5f/attachment.html>