Re: Unable to merge staging

[James]

On 13/02/14 10:31, David Kastrup wrote:
> Francisco Vila <address@hidden> writes:
>
> > 2014-02-13 10:47 GMT+01:00 David Kastrup <address@hidden>:
> > > Looking at git log --stat it would appear that I did not realize changes
> > > to be in both files.  However, in order to avoid unexpected changes
> > > (even if just in whitespace etc),
> > Yes, what makelsr does to the same snippets in snippets/ only is the
> > same I did in my patch, except it also adds a newline.
> >
> > > one should always just do the changes
> > > in snippets/new manually and then commit the makelsr run separately.
> > Understood.
> >
> > Running makelsr after my changes on snippets/new changes version to 3
> > unrelated snippets.
> Then there were changes in snippets/new that would have warranted a
> makelsr run previously.
>
> If one does not want intermingling changes, it's possible to split the
> work into three commits:
>
> Run makelsr, do manual changes to snippets/new, run makelsr.

I think perhaps the CG needs some clarification or at least some more 
detail on this whole process. It is there but I think if you don't do it 
often or are new to the process it can seem confusing (for example do 
you makelsr.py before you submit a patch for testing? or after? and like 
here, what is best when you push etc. I always forget :) and have to 
remind myself). Not that I need it explained, we just need it documented 
'better' perhaps.

I've been meaning to update the 'how to add/modify/delete snippets' 
section so it is clearer for those that are familiar with the process 
already. I'll try and sit down this weekend and come up with something.

James