From 3b77a66507a381c093660b98452037742c5eab02 Mon Sep 17 00:00:00 2001 From: Brian Clifton Date: Mon, 18 Mar 2019 09:33:18 -0700 Subject: [PATCH] Uplift of #1992 (squashed) to release --- script/uplift.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/script/uplift.py b/script/uplift.py index c84dba214034..1d67b92d0610 100755 --- a/script/uplift.py +++ b/script/uplift.py @@ -328,7 +328,7 @@ def create_branch(channel, top_level_base, remote_base, local_branch): if is_nightly(channel): return local_branch - channel_branch = remote_base + '_' + local_branch + channel_branch = local_branch + '_' + remote_base if is_sha(top_level_base): compare_from = top_level_base @@ -358,6 +358,7 @@ def create_branch(channel, top_level_base, remote_base, local_branch): # create the branch print('(' + channel + ') creating "' + channel_branch + '" from ' + remote_base) execute(['git', 'checkout', remote_base]) + execute(['git', 'pull', 'origin', remote_base]) execute(['git', 'checkout', '-b', channel_branch]) # TODO: handle errors thrown by cherry-pick