Merge pull request #1995 from brave/pr1992_fix-uplift-script_0.61.x

Fix two bugs with uplift script (uplift to 0.61.x)
brave · Mar 18, 2019 · 7ccfd49 · 7ccfd49
2 parents 2d5a9bc + 3b77a66
commit 7ccfd49
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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