Back to build
Raw log | Switch to full mode | Login

{ "did_run": true, "failed_patch_body": "Looking for .gclient starting from /b/s/w/ir/cache/builder\n\nLoaded .gclient config in /b/s/w/ir/cache/builder:\nsolutions = [ { 'custom_vars': { 'checkout_telemetry_dependencies': 'True'},\n 'deps_file': '.DEPS.git',\n 'managed': False,\n 'name': 'src',\n 'url': 'https://chromium.googlesource.com/chromium/src.git'}]\n\ncache_dir = r\"/b/s/w/ir/cache/git\"\n\n\ntarget_os_only=False\n\n\n\nsrc\n----------------------------------------\n[0:00:00] Started.\n_____ src at refs/remotes/origin/master\n[0:00:00] ________ unmanaged solution; skipping src\n[0:00:00] ===Applying patch ref===\n[0:00:00] Patch ref is 'https://chromium.googlesource.com/chromium/src.git' @ 'refs/changes/33/1554833/2'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'e0ebd13f466cbe92debe8ee35bf8b77684746252'. Current dir is '/b/s/w/ir/cache/builder/src'\n[0:00:14] Merge base of refs/remotes/origin/master and b2bb86acd8d63394ea19e398bd1996d6da3ddff1 is c179aecf42ee0caf5e9c25d7b70ec99f8dccae39\n[0:00:17] Failed to apply patch.\n[0:00:17] Patch ref is 'https://chromium.googlesource.com/chromium/src.git' @ 'refs/changes/33/1554833/2'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'e0ebd13f466cbe92debe8ee35bf8b77684746252'. Current dir is '/b/s/w/ir/cache/builder/src'\n[0:00:17] git returned non-zero exit status 1:\nerror: could not apply b2bb86acd8d6... Revert \"Revert \"Bypass ThemePainter for text fields when dark mode enabled.\"\"\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n\n[0:00:21] HEAD detached at origin/master\nYou are currently cherry-picking commit b2bb86acd8d6.\n (fix conflicts and run \"git cherry-pick --continue\")\n (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n\nChanges to be committed:\n\n\tmodified: third_party/blink/renderer/core/paint/theme_painter_default.cc\n\tnew file: third_party/blink/web_tests/paint/dark-mode/native-theme-off/text-input-elements.html\n\tnew file: third_party/blink/web_tests/paint/dark-mode/native-theme-on/text-input-elements.html\n\tnew file: third_party/blink/web_tests/platform/linux/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/linux/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/linux/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/linux/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/mac/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/mac/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/mac/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/mac/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/win/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/win/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/win/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/win/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/native-theme-off/README.txt\n\tnew file: third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/native-theme-on/README.txt\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\n\tboth modified: third_party/blink/web_tests/VirtualTestSuites\n----------------------------------------\n\nsrc (ERROR)\n----------------------------------------\n[0:00:00] Started.\n_____ src at refs/remotes/origin/master\n[0:00:00] ________ unmanaged solution; skipping src\n[0:00:00] ===Applying patch ref===\n[0:00:00] Patch ref is 'https://chromium.googlesource.com/chromium/src.git' @ 'refs/changes/33/1554833/2'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'e0ebd13f466cbe92debe8ee35bf8b77684746252'. Current dir is '/b/s/w/ir/cache/builder/src'\n[0:00:14] Merge base of refs/remotes/origin/master and b2bb86acd8d63394ea19e398bd1996d6da3ddff1 is c179aecf42ee0caf5e9c25d7b70ec99f8dccae39\n[0:00:17] Failed to apply patch.\n[0:00:17] Patch ref is 'https://chromium.googlesource.com/chromium/src.git' @ 'refs/changes/33/1554833/2'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'e0ebd13f466cbe92debe8ee35bf8b77684746252'. Current dir is '/b/s/w/ir/cache/builder/src'\n[0:00:17] git returned non-zero exit status 1:\nerror: could not apply b2bb86acd8d6... Revert \"Revert \"Bypass ThemePainter for text fields when dark mode enabled.\"\"\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n\n[0:00:21] HEAD detached at origin/master\nYou are currently cherry-picking commit b2bb86acd8d6.\n (fix conflicts and run \"git cherry-pick --continue\")\n (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n\nChanges to be committed:\n\n\tmodified: third_party/blink/renderer/core/paint/theme_painter_default.cc\n\tnew file: third_party/blink/web_tests/paint/dark-mode/native-theme-off/text-input-elements.html\n\tnew file: third_party/blink/web_tests/paint/dark-mode/native-theme-on/text-input-elements.html\n\tnew file: third_party/blink/web_tests/platform/linux/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/linux/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/linux/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/linux/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/mac/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/mac/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/mac/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/mac/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/win/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/win/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/win/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/platform/win/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png\n\tnew file: third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/native-theme-off/README.txt\n\tnew file: third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/native-theme-on/README.txt\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\n\tboth modified: third_party/blink/web_tests/VirtualTestSuites\n----------------------------------------\nError: Command 'git cherry-pick c179aecf42ee0caf5e9c25d7b70ec99f8dccae39..b2bb86acd8d63394ea19e398bd1996d6da3ddff1 --keep-redundant-commits' returned non-zero exit status 1 in /b/s/w/ir/cache/builder/src\nerror: could not apply b2bb86acd8d6... Revert \"Revert \"Bypass ThemePainter for text fields when dark mode enabled.\"\"\nhint: after resolving the conflicts, mark the corrected paths\nhint: with 'git add <paths>' or 'git rm <paths>'\nhint: and commit the result with 'git commit'\n\n", "fixed_revisions": { "src": "HEAD" }, "patch_apply_return_code": 1, "patch_failure": true, "patch_root": "src", "root": "src", "step_text": "[149GB/232GB used (64%)] PATCH FAILED" }