From 4803fbbc05070e45c925578e445f79fb1b725f19 Mon Sep 17 00:00:00 2001
From: SpiritCroc <dev@spiritcroc.de>
Date: Sat, 11 Sep 2021 10:01:11 +0200
Subject: [PATCH] merge_helpers.sh: Allow restoring upstream files deleted
 downstream

Change-Id: Ib02d37f4c5e2414b04e5fdf6006e6e3c13f4827a
---
 merge_helpers.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/merge_helpers.sh b/merge_helpers.sh
index acb73ae955..87cc0e7d7b 100755
--- a/merge_helpers.sh
+++ b/merge_helpers.sh
@@ -67,7 +67,9 @@ restore_upstream() {
     local path="$(dirname "$1")"
     local sc_f="tmp_sc_$f"
     local upstream_f="upstream_$f"
-    mv "$path/$f" "$path/$sc_f"
+    if [ -e "$path/$f" ]; then
+        mv "$path/$f" "$path/$sc_f"
+    fi
     if [ -e "$path/$upstream_f" ]; then
         mv "$path/$upstream_f" "$path/$f"
     fi