Re: [Outreachy kernel] patchset question

[Alison Schofield <amsfield22@gmail.com>]

On Wed, Oct 21, 2015 at 07:24:15AM +0200, Julia Lawall wrote:
> On Tue, 20 Oct 2015, Alison Schofield wrote:
> 
> > 
> > Patchset help needed:
> > 
> > I've changed one file in 5 different ways..all cleanup related. 
> > It will be split into 5 patches.
> > 
> > In one branch I used git add -pi followed by commit to incrementally
> > create 5 commits.  Each one dependent on the previous.  This is easy to grab 
> > and build as a patchset because they are all on the same branch.
> > 
> > Is this method  OK?
> > 
> > (The alternative is to give each commit it's own branch to keep them
> > independent.)
> > 
> > Searching archives of opw kernel I found reference to the dependent
> > commits, stating it was OK.  But that may be outdated, so checking in.
> 
> I still don't understand why this methodology would cause code to move 
> from above to below a comment.
> 
> julia
>

You are right Julia.  Good methodology, but error in implementation ;)

In reviewing the set of diffs for version 1, I do find that the comment 
moved when I picked the comments out for their patch.  The bad move is 
visible in the comments patch and in the patch where you noticed it in the
diff.

It wasn't intentional.  It happened during the partial add. In this
'hunk', as git add calls it, when the changes are too close together to
be hunks, or to split, you get popped into vim to manually edit.  That
has to be where I made the mistake.

The partial add is a nice feature.  I hope to try it again with these
lessons learned.

alisons





> > 
> > Thanks!
> > alison
> > 
> > 
> > -- 
> > You received this message because you are subscribed to the Google Groups "outreachy-kernel" group.
> > To unsubscribe from this group and stop receiving emails from it, send an email to outreachy-kernel+unsubscribe@googlegroups.com.
> > To post to this group, send email to outreachy-kernel@googlegroups.com.
> > To view this discussion on the web visit https://groups.google.com/d/msgid/outreachy-kernel/20151020232149.GA13649%40Ubuntu-D830.
> > For more options, visit https://groups.google.com/d/optout.
> >