HackMD
How to backport from alpha to mumbai
First, get the commit of your merge request and the latest merge:
$ git log master
commit 71aeefba399a9c5a97b94b0fb0426638186dba93 (tezos/master, master)
Merge: a345523ba3 89b042aa12
Author: Marge Bot <marge-bot@nomadic-labs.com>
Date: Mon Dec 12 14:24:12 2022 +0000
Merge tezos/tezos!7109: Scoru,Proto: removes redundant [level_proof] field
Co-authored-by: Valentin Chaboche <valentin.chaboche@nomadic-labs.com>
Approved-by: Yann Regis-Gianas <946787-yrg@users.noreply.gitlab.com>
Approved-by: Pierrick Couderc <pierrick.couderc@nomadic-labs.com>
See merge request https://gitlab.com/tezos/tezos/-/merge_requests/7109
commit 89b042aa127333171c995b111ec552663e44727c
Author: Valentin Chaboche <valentin.chaboche@nomadic-labs.com>
Date: Fri Dec 9 23:10:04 2022 +0100
Scoru,Proto: removes redundant [level_proof] field
commit a345523ba3e416268bbecae9fd3a2293c25ce74f
Merge: 6fbacfffd5 19f3e63c5c
Author: Marge Bot <marge-bot@nomadic-labs.com>
Date: Mon Dec 12 13:57:42 2022 +0000
Merge tezos/tezos!7107: WASM: Restrict reading from and writing to durable storage
Co-authored-by: Thomas Letan <lthms@nomadic-labs.com>
Approved-by: Emma Turner <1623821-emturner@users.noreply.gitlab.com>
Approved-by: Pierrick Couderc <pierrick.couderc@nomadic-labs.com>
See merge request https://gitlab.com/tezos/tezos/-/merge_requests/7107
For example, my goal is to backport !7109. So I'll get the diff of my merge request:
git format-patch 71aeefba399a9c5a97b94b0fb0426638186dba93 a345523ba3e416268bbecae9fd3a2293c25ce74f --stdout > patch_on_alpha.diff
Then you move the patch from Alpha to Mumbai:
sed 's/proto\_alpha/proto_016_PtMumbai/g' patch_on_alpha.diff > patch_on_mumbai.diff
Apply the patch and add the necessary diffs.
git apply patch_on_mumbai.diff
Finally create a merge request targeting the branch mumbai
