Changes between Version 45 and Version 46 of HowToGit

Timestamp:

May 26, 2019, 4:30:18 AM (5 years ago)

Author:

neteler

Comment:

Draft workflow for backporting

HowToGit

@@ -154 +154 @@
 == Backporting to release branches ==
 
-TODO
+=== Preparation ===
+
+If you checked out the release branch into a separate directory, be sure to have "upstream" enabled as a remote:
+
+{{{
+git remote -v
+# if upstream is missing, execute
+git remote add upstream git@github.com:OSGeo/grass.git
+}}}
+
+
+=== Backporting of single commits ===
+
+{{{
+git checkout master
+# With git log, identify the sha1sum of the commit you want to backport (example: into releasebranch_7_6)
+
+# switch to branch
+git checkout releasebranch_7_6
+# update
+git pull origin releasebranch_7_6 --rebase
+# backport the commit
+git cherry-pick the_sha1_sum
+# push to upstream
+git push upstream releasebranch_7_6 
+}}}
 
 See also https://github.com/OSGeo/gdal/blob/master/CONTRIBUTING.md#backporting-bugfixes-from-master-to-a-stable-branch
 
+=== Backporting of a merged pull request from master ===
+
+Same as "Backporting of single commits" but with multiple `git cherry-pick ...`. Importantly, in the right order.
+
+TODO: there must be a better way!!
+
+=== Made a mess? Fix it ===
+
+Example: mess happened on releasebranch_7_6:
+
+{{{
+git reset --hard upstream/releasebranch_7_6 
+git pull upstream releasebranch_7_6 --rebase
+
+# now all should be clean again
+}}}
 == Further reading ==