kicad-developers team mailing list archive

[Wayne Stambaugh <stambaughw@xxxxxxxxx>]

On 7/17/2018 12:12 PM, Seth Hillbrand wrote:
> Hi Wayne-
> 
> Just so I'm clear on how you'd like this to work:
> 
> We have a commit that affects 5.0.x, 5.1 and 6.  We could do
> 1) git checkout master
> 2) git commit (get <SHA_VALUE> back)
> 3) git checkout 5.1
> 4) git cherry-pick <SHA_VALUE>
> 5) compile/test
> 6) git checkout 5.0
> 7) git cherry-pick <SHA_VALUE>
> 8) compile/test
> 9) git push
> 
> This will get 3 separate SHA (one for each branch).  Or would you prefer
> us to use git merge to keep the original SHA with an additional merge
> commit?  I can see arguments for each but wanted to check which is
> preferred.

I really don't have a preference other than to make sure we don't push
commits to the wrong branch.  I used git cherry-pick for the 4.0 branch
maintenance so if using it is easiest for you, then that's what you
should use.

> 
> -Seth
> 
> 
> Am Di., 17. Juli 2018 um 06:32 Uhr schrieb Wayne Stambaugh
> <stambaughw@xxxxxxxxx <mailto:stambaughw@xxxxxxxxx>>:
> 
>     Just a quick reminder to the lead developers, if you push a bug fix into
>     the development branch that effects the 5.0 and 5.1 branches, please
>     don't forget to push the fix to the 5.0 and 5.1 branches.
> 
>     Thanks,
> 
>     Wayne
> 
>     _______________________________________________
>     Mailing list: https://launchpad.net/~kicad-developers
>     <https://launchpad.net/%7Ekicad-developers>
>     Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>     <mailto:kicad-developers@xxxxxxxxxxxxxxxxxxx>
>     Unsubscribe : https://launchpad.net/~kicad-developers
>     <https://launchpad.net/%7Ekicad-developers>
>     More help   : https://help.launchpad.net/ListHelp
>