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

Looking for .gclient starting from /b/s/w/ir/cache/builder Loaded .gclient config in /b/s/w/ir/cache/builder: solutions = [ { 'custom_vars': { 'checkout_telemetry_dependencies': 'True'}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'src', 'url': 'https://chromium.googlesource.com/chromium/src.git'}] cache_dir = r"/b/s/w/ir/cache/git" target_os_only=False src ---------------------------------------- [0:00:00] Started. _____ src at refs/remotes/origin/master [0:00:00] ________ unmanaged solution; skipping src [0:00:00] ===Applying patch ref=== [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' [0:00:14] Merge base of refs/remotes/origin/master and b2bb86acd8d63394ea19e398bd1996d6da3ddff1 is c179aecf42ee0caf5e9c25d7b70ec99f8dccae39 [0:00:17] Failed to apply patch. [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' [0:00:17] git returned non-zero exit status 1: error: could not apply b2bb86acd8d6... Revert "Revert "Bypass ThemePainter for text fields when dark mode enabled."" hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' [0:00:21] HEAD detached at origin/master You are currently cherry-picking commit b2bb86acd8d6. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: third_party/blink/renderer/core/paint/theme_painter_default.cc new file: third_party/blink/web_tests/paint/dark-mode/native-theme-off/text-input-elements.html new file: third_party/blink/web_tests/paint/dark-mode/native-theme-on/text-input-elements.html new file: third_party/blink/web_tests/platform/linux/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/linux/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/linux/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/linux/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/mac/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/mac/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/mac/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/mac/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/win/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/win/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/win/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/win/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/native-theme-off/README.txt new file: third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/native-theme-on/README.txt Unmerged paths: (use "git add <file>..." to mark resolution) both modified: third_party/blink/web_tests/VirtualTestSuites ---------------------------------------- src (ERROR) ---------------------------------------- [0:00:00] Started. _____ src at refs/remotes/origin/master [0:00:00] ________ unmanaged solution; skipping src [0:00:00] ===Applying patch ref=== [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' [0:00:14] Merge base of refs/remotes/origin/master and b2bb86acd8d63394ea19e398bd1996d6da3ddff1 is c179aecf42ee0caf5e9c25d7b70ec99f8dccae39 [0:00:17] Failed to apply patch. [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' [0:00:17] git returned non-zero exit status 1: error: could not apply b2bb86acd8d6... Revert "Revert "Bypass ThemePainter for text fields when dark mode enabled."" hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit' [0:00:21] HEAD detached at origin/master You are currently cherry-picking commit b2bb86acd8d6. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: third_party/blink/renderer/core/paint/theme_painter_default.cc new file: third_party/blink/web_tests/paint/dark-mode/native-theme-off/text-input-elements.html new file: third_party/blink/web_tests/paint/dark-mode/native-theme-on/text-input-elements.html new file: third_party/blink/web_tests/platform/linux/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/linux/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/linux/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/linux/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/mac/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/mac/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/mac/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/mac/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/win/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/win/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/win/virtual/dark-mode/paint/dark-mode/native-theme-off/text-input-elements-expected.png new file: third_party/blink/web_tests/platform/win/virtual/dark-mode/paint/dark-mode/native-theme-on/text-input-elements-expected.png new file: third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/native-theme-off/README.txt new file: third_party/blink/web_tests/virtual/dark-mode/paint/dark-mode/native-theme-on/README.txt Unmerged paths: (use "git add <file>..." to mark resolution) both modified: third_party/blink/web_tests/VirtualTestSuites ---------------------------------------- Error: Command 'git cherry-pick c179aecf42ee0caf5e9c25d7b70ec99f8dccae39..b2bb86acd8d63394ea19e398bd1996d6da3ddff1 --keep-redundant-commits' returned non-zero exit status 1 in /b/s/w/ir/cache/builder/src error: could not apply b2bb86acd8d6... Revert "Revert "Bypass ThemePainter for text fields when dark mode enabled."" hint: after resolving the conflicts, mark the corrected paths hint: with 'git add <paths>' or 'git rm <paths>' hint: and commit the result with 'git commit'