Skip to content

Instantly share code, notes, and snippets.

@misterdjules
Created October 16, 2015 17:49
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save misterdjules/95dbd4705cea6d925ace to your computer and use it in GitHub Desktop.
Save misterdjules/95dbd4705cea6d925ace to your computer and use it in GitHub Desktop.
➜ v8 git:(master) ✗ tools/release/merge_to_branch.py --branch 4.5 1ee712ab8687e5f4dec93d45da068d37d28feb8b
>>> Step 0: Bootstapping v8 checkout.
Command: fetch v8
in /tmp/v8-release-scripts-work-dir
Error: Command 'download_from_google_storage --no_resume --platform=darwin --no_auth --bucket chromium-clang-format -s v8/buildtools/mac/clang-format.sha1' returned non-zero exit status 1 in /private/tmp/v8-release-scripts-work-dir
Traceback (most recent call last):
File "/Users/JulienGilli/depot_tools/fetch.py", line 335, in <module>
File "/Users/JulienGilli/depot_tools/fetch.py", line 330, in main
print
File "/Users/JulienGilli/depot_tools/fetch.py", line 324, in run
except KeyError:
File "/Users/JulienGilli/depot_tools/fetch.py", line 136, in init
if self.options.nohooks:
File "/Users/JulienGilli/depot_tools/fetch.py", line 76, in run_gclient
return self.run(cmd_prefix + cmd, **kwargs)
File "/Users/JulienGilli/depot_tools/fetch.py", line 66, in run
return subprocess.check_output(cmd, **kwargs)
File "/System/Library/Frameworks/Python.framework/Versions/2.7/lib/python2.7/subprocess.py", line 542, in check_call
raise CalledProcessError(retcode, cmd)
subprocess.CalledProcessError: Command '('gclient', 'sync', '--with_branch_heads')' returned non-zero exit status 2
>>> Step 1: Preparation.
Error: A merge is already in progress
Exiting
Traceback (most recent call last):
File "tools/release/merge_to_branch.py", line 290, in <module>
sys.exit(MergeToBranch().Run())
File "/Users/JulienGilli/dev/v8/tools/release/common_includes.py", line 881, in Run
return self.RunSteps(self._Steps(), args)
File "/Users/JulienGilli/dev/v8/tools/release/common_includes.py", line 876, in RunSteps
if step.Run():
File "/Users/JulienGilli/dev/v8/tools/release/common_includes.py", line 421, in Run
return self.RunStep()
File "tools/release/merge_to_branch.py", line 46, in RunStep
self.Die("A merge is already in progress")
File "/Users/JulienGilli/dev/v8/tools/release/common_includes.py", line 502, in Die
raise Exception(msg)
Exception: A merge is already in progress
➜ v8 git:(master) ✗
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment