how to backport in git(hub)?

classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

how to backport in git(hub)?

Helmut Kudrnovsky
hi,

https://github.com/OSGeo/grass/pull/53

is labelled as backport needed.

in https://trac.osgeo.org/grass/wiki/HowToGit#Backportingofasinglecommit

---------
# temporarily switch to master
git checkout master

# update master to fetch the commit to be backported
git fetch --all --prune

# Note: only needed if you have your fork as "origin" (see above)
# update local repo
## NO git pull origin releasebranch_7_6 --rebase
# merge updates into local master
git merge upstream/releasebranch_7_6
# at this point we have reached:
# (HEAD -> master, upstream/releasebranch_7_6, releasebranch_7_6)

# ??? update own remote
git push origin releasebranch_7_6

# ??? With git log, identify the sha1sum of the commit you want to backport
(example: backport into releasebranch_7_6)
git log

# switch to branch
git checkout releasebranch_7_6

# now backport the commit (edit conflicts if needed)
git cherry-pick the_sha1_sum

# verify
git show

# push backport to upstream
git push upstream releasebranch_7_6
--------

are all these steps needed for backporting a single commit like pull/53?



-----
best regards
Helmut
--
Sent from: http://osgeo-org.1560.x6.nabble.com/Grass-Dev-f3991897.html
_______________________________________________
grass-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/grass-dev
best regards
Helmut
Reply | Threaded
Open this post in threaded view
|

Re: how to backport in git(hub)?

Martin Landa
Hi,

I am using simplified workflow:

(assumming that we are in releasebranch_7_6 branch)
git fetch --all
git rebase upstream/releasebranch_7_6
git cherry-pick hash
(or
git cherry-pick -m1 hash
when cherry picking a merge request
)
git push upstream releasebranch_7_6

Ma

Ășt 16. 7. 2019 v 10:13 odesĂ­latel Helmut Kudrnovsky <[hidden email]> napsal:

>
> hi,
>
> https://github.com/OSGeo/grass/pull/53
>
> is labelled as backport needed.
>
> in https://trac.osgeo.org/grass/wiki/HowToGit#Backportingofasinglecommit
>
> ---------
> # temporarily switch to master
> git checkout master
>
> # update master to fetch the commit to be backported
> git fetch --all --prune
>
> # Note: only needed if you have your fork as "origin" (see above)
> # update local repo
> ## NO git pull origin releasebranch_7_6 --rebase
> # merge updates into local master
> git merge upstream/releasebranch_7_6
> # at this point we have reached:
> # (HEAD -> master, upstream/releasebranch_7_6, releasebranch_7_6)
>
> # ??? update own remote
> git push origin releasebranch_7_6
>
> # ??? With git log, identify the sha1sum of the commit you want to backport
> (example: backport into releasebranch_7_6)
> git log
>
> # switch to branch
> git checkout releasebranch_7_6
>
> # now backport the commit (edit conflicts if needed)
> git cherry-pick the_sha1_sum
>
> # verify
> git show
>
> # push backport to upstream
> git push upstream releasebranch_7_6
> --------
>
> are all these steps needed for backporting a single commit like pull/53?
>
>
>
> -----
> best regards
> Helmut
> --
> Sent from: http://osgeo-org.1560.x6.nabble.com/Grass-Dev-f3991897.html
> _______________________________________________
> grass-dev mailing list
> [hidden email]
> https://lists.osgeo.org/mailman/listinfo/grass-dev



--
Martin Landa
http://geo.fsv.cvut.cz/gwiki/Landa
http://gismentors.cz/mentors/landa
_______________________________________________
grass-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/grass-dev
Reply | Threaded
Open this post in threaded view
|

Re: how to backport in git(hub)?

Markus Neteler
On Tue, Jul 16, 2019 at 12:05 PM Martin Landa <[hidden email]> wrote:

>
> Hi,
>
> I am using simplified workflow:
>
> (assumming that we are in releasebranch_7_6 branch)
> git fetch --all
> git rebase upstream/releasebranch_7_6
> git cherry-pick hash
> (or
> git cherry-pick -m1 hash
> when cherry picking a merge request
> )
> git push upstream releasebranch_7_6

Thanks, updated here:

https://trac.osgeo.org/grass/wiki/HowToGit#Backportingofasinglecommitfrommastertoreleasebranch

Markus
_______________________________________________
grass-dev mailing list
[hidden email]
https://lists.osgeo.org/mailman/listinfo/grass-dev