bot_update step fails when patch contains incorrect unicode |
|||||
Issue descriptionI have a patch that contains a file with bad unicode (for testing purposes). bot_update step fails to patch this one: @@@STEP_LOG_LINE@patch error@Failed to apply patch for third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string:@@@ @@@STEP_LOG_LINE@patch error@While running git apply --index -3 -p1 --verbose;@@@ @@@STEP_LOG_LINE@patch error@ Checking patch third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string...@@@ @@@STEP_LOG_LINE@patch error@ error: while searching for:@@@ @@@STEP_LOG_LINE@patch error@ rÿ@@@ @@@STEP_LOG_LINE@patch error@ error: patch failed: third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string:1@@@ @@@STEP_LOG_LINE@patch error@ Falling back to three-way merge...@@@ @@@STEP_LOG_LINE@patch error@ error: while searching for:@@@ @@@STEP_LOG_LINE@patch error@ rÿ@@@ @@@STEP_LOG_LINE@patch error@ error: patch failed: third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string:1@@@ @@@STEP_LOG_LINE@patch error@ error: third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string: patch does not apply@@@ @@@STEP_LOG_LINE@patch error@@@@ @@@STEP_LOG_LINE@patch error@Patch: third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string@@@ @@@STEP_LOG_LINE@patch error@Index: third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string@@@ @@@STEP_LOG_LINE@patch error@diff --git a/third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string b/third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string@@@ @@@STEP_LOG_LINE@patch error@index 9fe8c89ed65ff70fd130c39714f89aa7fe1ec300..a1337ec68951c13b2c194baa240723e123ce25ce 100644@@@ @@@STEP_LOG_LINE@patch error@--- a/third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string@@@ @@@STEP_LOG_LINE@patch error@+++ b/third_party/protobuf/src/google/protobuf/testdata/bad_utf8_string@@@ @@@STEP_LOG_LINE@patch error@@@ -1 +1 @@@@@ @@@STEP_LOG_LINE@patch error@-rÿ@@@ @@@STEP_LOG_LINE@patch error@\ No newline at end of file@@@ @@@STEP_LOG_LINE@patch error@+rÿ@@@ @@@STEP_LOG_LINE@patch error@\ No newline at end of file@@@ @@@STEP_LOG_LINE@patch error@@@@ @@@STEP_LOG_LINE@patch error@CWD=/b/build/slave/android_chromium_gn/build@@@ @@@STEP_LOG_LINE@patch error@Checkout path=/b/build/slave/android_chromium_gn/build/src@@@
,
May 17 2016
https://build.chromium.org/p/tryserver.chromium.android/builders/android_chromium_gn_compile_dbg/builds/68017 https://codereview.chromium.org/1983203003 I'll be removing that file from the CL though as a temporary workaround.
,
Jun 1 2016
,
Jul 6 2016
,
Jan 18 2017
Stale, dropping priority.
,
Aug 18 2017
,
Jan 3 2018
|
|||||
►
Sign in to add a comment |
|||||
Comment 1 by phajdan.jr@chromium.org
, May 17 2016Labels: -Pri-3 Pri-2