From: teor <teor@torproject.org>
Date: Tue, 15 Oct 2019 03:36:56 +0000 (+1000)
Subject: scripts: Merge forward test branch _042 into test branch _master
X-Git-Tag: tor-0.4.3.1-alpha~306^2~1
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=028987a0a1e841d7faf3ac131b0bd2795a963aa5;p=thirdparty%2Ftor.git

scripts: Merge forward test branch _042 into test branch _master

Fixes an issue where test branch _041 was merged into _042 and _master.
This issue only affects test branch mode (-t).
---

diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh
index d16519b3f5..59adbab82d 100755
--- a/scripts/git/git-merge-forward.sh
+++ b/scripts/git/git-merge-forward.sh
@@ -101,7 +101,7 @@ MAINT_041=( "maint-0.4.1" "maint-0.4.0" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.1" \
 MAINT_042=( "maint-0.4.2" "maint-0.4.1" "$GIT_PATH/$TOR_WKT_NAME/maint-0.4.2" \
     "_042" "_041")
 MAINT_MASTER=( "master" "maint-0.4.2" "$GIT_PATH/$TOR_MASTER_NAME" \
-    "_master" "_041")
+    "_master" "_042")
 
 RELEASE_029=( "release-0.2.9" "maint-0.2.9" "$GIT_PATH/$TOR_WKT_NAME/release-0.2.9" )
 RELEASE_035=( "release-0.3.5" "maint-0.3.5" "$GIT_PATH/$TOR_WKT_NAME/release-0.3.5" )