From 411a2388ac14466e518c8ece05e59d2fcbac0bf6 Mon Sep 17 00:00:00 2001 From: Matteo Silvestri Date: Tue, 22 Nov 2022 15:27:52 +0100 Subject: [PATCH] fix: fix missing blobs for upgrade-backstage-app 3 way merge was failing because of missing ancestors. Fetching the upgrade-helper-diff repository as one of your app's remotes fixes the problem. The upgrade-helper-diff contains a branch for each version with a clean app bootstrapped with the create-app script. Signed-off-by: Matteo Silvestri --- contrib/scripts/upgrade-backstage-app/upgrade-backstage-app.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/contrib/scripts/upgrade-backstage-app/upgrade-backstage-app.sh b/contrib/scripts/upgrade-backstage-app/upgrade-backstage-app.sh index d68d9e31c4..09fe4fc381 100755 --- a/contrib/scripts/upgrade-backstage-app/upgrade-backstage-app.sh +++ b/contrib/scripts/upgrade-backstage-app/upgrade-backstage-app.sh @@ -9,6 +9,8 @@ if [ "$CURRENT_VERSION" == "$TARGET_VERSION" ]; then else echo "Attempting upgrade from Backstage $CURRENT_VERSION (create-app $CREATE_APP_CURRENT_VERSION) to $TARGET_VERSION ($CREATE_APP_TARGET_VERSION)" rm -rf .upgrade && mkdir .upgrade + git remote add upgrade-helper https://github.com/backstage/upgrade-helper-diff.git + git fetch upgrade-helper curl -s https://raw.githubusercontent.com/backstage/upgrade-helper-diff/master/diffs/$CREATE_APP_CURRENT_VERSION..$CREATE_APP_TARGET_VERSION.diff > .upgrade/upgrade.diff git apply -3 .upgrade/upgrade.diff git mergetool