Created
April 9, 2019 18:13
-
-
Save jorendorff/59b7e7c5945b997721d0286bc709017b to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
$ hg log -r tip | |
changeset: 539025:519828d4a0a5 | |
tag: tip | |
parent: 538768:93075ec49df3 | |
user: Jason Orendorff <[email protected]> | |
date: Tue Apr 09 13:11:27 2019 -0500 | |
summary: Bug 1539821 - Part 1: Delete ModifierException::NoneIsOperand. r?jwalden | |
================================================================================ 2019-04-09 13:11:34 | |
~/work/gecko$ hg rebase -r tip -d central --verbose | |
rebasing 539025:519828d4a0a5 "Bug 1539821 - Part 1: Delete ModifierException::NoneIsOperand. r?jwalden" (tip) | |
resolving manifests | |
getting js/src/frontend/Parser.cpp | |
resolving manifests | |
getting js/src/frontend/Parser.cpp | |
merging js/src/frontend/TokenStream.h | |
Processing 1 file(s)... | |
YAML:28:19: error: unknown key 'StatementMacros' | |
StatementMacros: [MARKUPMAP, ASSERT_TRUE, ASSERT_FALSE, TEST, CHECK] | |
^ | |
Error reading /Users/jorendorff/work/gecko/.clang-format: Invalid argument | |
The error occurred in the implementation of the invoked mach command. | |
This should never occur and is likely a bug in the implementation of that | |
command. Consider filing a bug for this issue. | |
If filing a bug, please include the full output of mach, including this error | |
message. | |
The details of the failure are as follows: | |
AssertionError | |
File "/Users/jorendorff/work/gecko/python/mach/mach/main.py", line 524, in _run | |
**vars(args.command_args)) | |
File "/Users/jorendorff/work/gecko/python/mach/mach/registrar.py", line 101, in _run_command_handler | |
assert isinstance(result, (int, long)) | |
committing files: | |
js/src/frontend/Parser.cpp | |
committing manifest | |
committing changelog | |
rebase merging completed | |
update back to initial working directory parent | |
resolving manifests | |
rebase completed |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment