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

Looking for .gclient starting from e:\b\swarm_slave\w\ir\cache\builder Loaded .gclient config in e:\b\swarm_slave\w\ir\cache\builder: solutions = [ { 'custom_vars': { 'dawn_root': 'dawn'}, 'deps_file': '.DEPS.git', 'managed': False, 'name': 'dawn', 'url': 'https://dawn.googlesource.com/dawn.git'}] cache_dir = r"e:\\b\\swarm_slave\\w\\ir\\cache\\git" target_os_only=False dawn ---------------------------------------- [0:00:00] Started. _____ dawn at refs/remotes/origin/master [0:00:00] ________ unmanaged solution; skipping dawn [0:00:00] ===Applying patch ref=== [0:00:00] Patch ref is 'https://dawn.googlesource.com/dawn.git' @ 'refs/changes/60/2460/24'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'd758e32610cb8b8b8792570d0d0a7b44b530ff03'. Current dir is 'e:\\b\\swarm_slave\\w\\ir\\cache\\builder\\dawn' [0:00:01] Merge base of refs/remotes/origin/master and ce956aa33d60a7eca633ae3efa56e8537bf7830a is 0da9494a4fe9aa89e1a3b2d911719d150a2d963e [0:00:02] Failed to apply patch. [0:00:02] Patch ref is 'https://dawn.googlesource.com/dawn.git' @ 'refs/changes/60/2460/24'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'd758e32610cb8b8b8792570d0d0a7b44b530ff03'. Current dir is 'e:\\b\\swarm_slave\\w\\ir\\cache\\builder\\dawn' [0:00:02] git returned non-zero exit status 1: error: could not apply baec811... Let DeviceBase know about Completed LastSubmitted, and Pending command Serials 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:02] HEAD detached from origin/master You are currently cherry-picking commit baec811. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --abort" to cancel the cherry-pick operation) Unmerged paths: (use "git add <file>..." to mark resolution) both modified: src/dawn_native/metal/DeviceMTL.mm no changes added to commit (use "git add" and/or "git commit -a") ---------------------------------------- dawn (ERROR) ---------------------------------------- [0:00:00] Started. _____ dawn at refs/remotes/origin/master [0:00:00] ________ unmanaged solution; skipping dawn [0:00:00] ===Applying patch ref=== [0:00:00] Patch ref is 'https://dawn.googlesource.com/dawn.git' @ 'refs/changes/60/2460/24'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'd758e32610cb8b8b8792570d0d0a7b44b530ff03'. Current dir is 'e:\\b\\swarm_slave\\w\\ir\\cache\\builder\\dawn' [0:00:01] Merge base of refs/remotes/origin/master and ce956aa33d60a7eca633ae3efa56e8537bf7830a is 0da9494a4fe9aa89e1a3b2d911719d150a2d963e [0:00:02] Failed to apply patch. [0:00:02] Patch ref is 'https://dawn.googlesource.com/dawn.git' @ 'refs/changes/60/2460/24'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'd758e32610cb8b8b8792570d0d0a7b44b530ff03'. Current dir is 'e:\\b\\swarm_slave\\w\\ir\\cache\\builder\\dawn' [0:00:02] git returned non-zero exit status 1: error: could not apply baec811... Let DeviceBase know about Completed LastSubmitted, and Pending command Serials 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:02] HEAD detached from origin/master You are currently cherry-picking commit baec811. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --abort" to cancel the cherry-pick operation) Unmerged paths: (use "git add <file>..." to mark resolution) both modified: src/dawn_native/metal/DeviceMTL.mm no changes added to commit (use "git add" and/or "git commit -a") ---------------------------------------- Error: Command 'git cherry-pick 0da9494a4fe9aa89e1a3b2d911719d150a2d963e..ce956aa33d60a7eca633ae3efa56e8537bf7830a --keep-redundant-commits' returned non-zero exit status 1 in e:\b\swarm_slave\w\ir\cache\builder\dawn [detached HEAD ed67dd1] Factor SerialQueue into SerialQueue and SerialMap Author: Austin Eng <enga@chromium.org> Date: Wed Nov 28 09:12:41 2018 -0800 error: could not apply baec811... Let DeviceBase know about Completed LastSubmitted, and Pending command Serials 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'