diff --git a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams index 862c5e1d5ee33e71c2274a4f5b76b282122e277f..8168cf4f1817560d1852717ecb89ba525b1059f6 100755 --- a/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams +++ b/package-source-builder/overlay/usr/bin/apertis-pkg-merge-upstream-to-downstreams @@ -109,6 +109,10 @@ def main(): push_this_merge_request() continue + print(f"Submit {proposed_branch} for merging into {downstream_branch} the updates from {upstream_branch}") + git("branch", proposed_branch, upstream_branch) + push_this_merge_request() + print(f"Attempt merging {upstream_branch} into {downstream_branch} via {proposed_branch}") git("checkout", "--force", "-B", "tmp", downstream_branch) apertis_pkg_merge_updates(f"--downstream={downstream_branch}", f"--upstream={upstream_branch}", f"--local-version-suffix={local_suffix}", _fg=True)