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/kitchen-workdir\n\nLoaded .gclient config in /b/s/w/ir/kitchen-workdir:\nsolutions = [ { 'deps_file': '.DEPS.git',\n 'managed': False,\n 'name': 'native_client',\n 'url': 'https://chromium.googlesource.com/native_client/src/native_client.git'}]\n\ncache_dir = r\"/b/s/w/ir/cache/git\"\n\n\ntarget_os_only=False\n\n\n\nnative_client\n----------------------------------------\n[0:00:00] Started.\n_____ native_client at refs/remotes/origin/master\n[0:00:00] ________ unmanaged solution; skipping native_client\n[0:00:00] ===Applying patch ref===\n[0:00:00] Patch ref is 'https://chromium.googlesource.com/native_client/src/native_client.git' @ 'refs/changes/36/1394436/1'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is '1ea07c56ac9b57c30eb784ab2af582af0cdd4b08'. Current dir is '/b/s/w/ir/kitchen-workdir/native_client'\n[0:00:01] Merge base of refs/remotes/origin/master and fba0adb2bed280a719a494f4edcb8092befe9d3a is 277022e0e51ae646448daf2d36a81502b8ac53b7\n[0:00:01] Failed to apply patch.\n[0:00:01] Patch ref is 'https://chromium.googlesource.com/native_client/src/native_client.git' @ 'refs/changes/36/1394436/1'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is '1ea07c56ac9b57c30eb784ab2af582af0cdd4b08'. Current dir is '/b/s/w/ir/kitchen-workdir/native_client'\n[0:00:01] git returned non-zero exit status 1:\nerror: could not apply fba0adb2b... Stop passing no-op --if-needed to clang update script.\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:01] HEAD detached at origin/master\nYou are currently cherry-picking commit fba0adb2b.\n (fix conflicts and run \"git cherry-pick --continue\")\n (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\n\tboth modified: DEPS\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n----------------------------------------\n\nnative_client (ERROR)\n----------------------------------------\n[0:00:00] Started.\n_____ native_client at refs/remotes/origin/master\n[0:00:00] ________ unmanaged solution; skipping native_client\n[0:00:00] ===Applying patch ref===\n[0:00:00] Patch ref is 'https://chromium.googlesource.com/native_client/src/native_client.git' @ 'refs/changes/36/1394436/1'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is '1ea07c56ac9b57c30eb784ab2af582af0cdd4b08'. Current dir is '/b/s/w/ir/kitchen-workdir/native_client'\n[0:00:01] Merge base of refs/remotes/origin/master and fba0adb2bed280a719a494f4edcb8092befe9d3a is 277022e0e51ae646448daf2d36a81502b8ac53b7\n[0:00:01] Failed to apply patch.\n[0:00:01] Patch ref is 'https://chromium.googlesource.com/native_client/src/native_client.git' @ 'refs/changes/36/1394436/1'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is '1ea07c56ac9b57c30eb784ab2af582af0cdd4b08'. Current dir is '/b/s/w/ir/kitchen-workdir/native_client'\n[0:00:01] git returned non-zero exit status 1:\nerror: could not apply fba0adb2b... Stop passing no-op --if-needed to clang update script.\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:01] HEAD detached at origin/master\nYou are currently cherry-picking commit fba0adb2b.\n (fix conflicts and run \"git cherry-pick --continue\")\n (use \"git cherry-pick --abort\" to cancel the cherry-pick operation)\n\nUnmerged paths:\n (use \"git add <file>...\" to mark resolution)\n\n\tboth modified: DEPS\n\nno changes added to commit (use \"git add\" and/or \"git commit -a\")\n----------------------------------------\nError: Command 'git cherry-pick 277022e0e51ae646448daf2d36a81502b8ac53b7..fba0adb2bed280a719a494f4edcb8092befe9d3a --keep-redundant-commits' returned non-zero exit status 1 in /b/s/w/ir/kitchen-workdir/native_client\nerror: could not apply fba0adb2b... Stop passing no-op --if-needed to clang update script.\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": { "native_client": "HEAD" }, "patch_apply_return_code": 1, "patch_failure": true, "patch_root": "native_client", "root": "native_client", "step_text": "[16GB/295GB used (5%)] PATCH FAILED" }