Created
January 2, 2019 12:00
-
-
Save andreastt/02ef9fba6ec0f9a3aad9f99e74959738 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
% git bz apply 1516262 | |
Bug 1516262 - Update base64 to 0.10 | |
0001-Bug-1516262-Part-1-Update-base64-and-bump-webdriver-.patch | |
Apply? [yn] y | |
Applying: Bug 1516262 - Part 1: Update base64 and bump webdriver's version | |
0002-Bug-1516262-Part-2-Revendor-rust-dependencies.patch | |
Apply? [yn] y | |
Applying: Bug 1516262 - Part 2: Revendor rust dependencies | |
error: patch failed: third_party/rust/safemem/LICENSE-APACHE:1 | |
error: third_party/rust/safemem/LICENSE-APACHE: patch does not apply | |
error: patch failed: third_party/rust/safemem/LICENSE-MIT:1 | |
error: third_party/rust/safemem/LICENSE-MIT: patch does not apply | |
error: patch failed: third_party/rust/safemem/README.md:1 | |
error: third_party/rust/safemem/README.md: patch does not apply | |
Patch failed at 0001 Bug 1516262 - Part 2: Revendor rust dependencies | |
Use 'git am --show-current-patch' to see the failed patch | |
When you have resolved this problem, run "git am --continue". | |
If you prefer to skip this patch, run "git am --skip" instead. | |
To restore the original branch and stop patching, run "git am --abort". | |
Patch left in /tmp/0002-Bug-1516262-Part-2-Revendor-rust-dependencies-6ejvWc.patch |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment