Re: [PATCH] New package: siproxd

[Otavio Salvador <otavio@ossystems.com.br>]

Roman I Khimov <khimov@altell.ru> writes:

> Otavio Salvador:
>> Basically we could suggest following workflow for regular users:
>>
>>  - when going to make any change at OE, start a personal branch
>>
>>    $: git checkout -b local master
>
> Here is when the problem starts. Currently we have overlay setup, so I'm 
> extracting everything I'm pushing now from overlay (which itself is managed 
> in git, but that's another story since at least one thing is not managed at 
> all in overlay - checksums).
>
>>    $: git format-patch master..
>>
>>  - mail them to ml
>
> And this is another thing I'm not sure about, there might be a lot 
> of 'intermediate' commits leading to nice-upstream-acceptable package, 
> pushing them all in series is kinda wrong, IMHO.
>
> There is of course some git kung fu that might help doing one patch for one 
> thing regardless of the number of intermediate results. But then again 
> there is reviewing process that leads to more changes and more git kung fu 
> to make single patch for single package again.
>
> Does it make any sense? Currently I'm trying to push new things in 'one 
> package - one patch' model, extracting package patch from overlay as `git 
> diff some_commit..` plus adding checksums to local OE tree and doing `git 
> diff` there (not commiting it at all). Then after new package is in, I'm 
> able to pull from main OE and remove things from overlay.

You need to created another temp branch and cherry-pick the changes to
it; after grabbing them you can use:

 $: git format-patch master..temp

-- 
Otavio Salvador                  O.S. Systems
E-mail: otavio@ossystems.com.br  http://www.ossystems.com.br
Mobile: +55 53 9981-7854         http://projetos.ossystems.com.br