diff options
| author | teor <teor@torproject.org> | 2019-10-15 13:36:56 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-10-15 13:36:56 +1000 |
| commit | 028987a0a1e841d7faf3ac131b0bd2795a963aa5 (patch) | |
| tree | 4d980c025bf95941a3bbb7ea940c2adcf8c06885 /scripts/git | |
| parent | dfe7f004df46edaab0b23e260218d3c6d422d5fe (diff) | |
| download | tor-028987a0a1e841d7faf3ac131b0bd2795a963aa5.tar.gz tor-028987a0a1e841d7faf3ac131b0bd2795a963aa5.zip | |
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).
Diffstat (limited to 'scripts/git')
| -rwxr-xr-x | scripts/git/git-merge-forward.sh | 2 |
1 files changed, 1 insertions, 1 deletions
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" ) |