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

Looking for .gclient starting from /b/s/w/ir/kitchen-workdir Loaded .gclient config in /b/s/w/ir/kitchen-workdir: solutions = [ { 'deps_file': '.DEPS.git', 'managed': False, 'name': 'native_client', 'url': 'https://chromium.googlesource.com/native_client/src/native_client.git'}] cache_dir = r"/b/s/w/ir/cache/git" target_os_only=False native_client ---------------------------------------- [0:00:00] Started. _____ native_client at refs/remotes/origin/master [0:00:00] ________ unmanaged solution; skipping native_client [0:00:00] ===Applying patch ref=== [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' [0:00:00] Merge base of refs/remotes/origin/master and fba0adb2bed280a719a494f4edcb8092befe9d3a is 277022e0e51ae646448daf2d36a81502b8ac53b7 [0:00:00] Failed to apply patch. [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' [0:00:00] git returned non-zero exit status 1: error: could not apply fba0adb2b... Stop passing no-op --if-needed to clang update script. 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:01] HEAD detached at origin/master You are currently cherry-picking commit fba0adb2b. (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: DEPS no changes added to commit (use "git add" and/or "git commit -a") ---------------------------------------- native_client (ERROR) ---------------------------------------- [0:00:00] Started. _____ native_client at refs/remotes/origin/master [0:00:00] ________ unmanaged solution; skipping native_client [0:00:00] ===Applying patch ref=== [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' [0:00:00] Merge base of refs/remotes/origin/master and fba0adb2bed280a719a494f4edcb8092befe9d3a is 277022e0e51ae646448daf2d36a81502b8ac53b7 [0:00:00] Failed to apply patch. [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' [0:00:00] git returned non-zero exit status 1: error: could not apply fba0adb2b... Stop passing no-op --if-needed to clang update script. 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:01] HEAD detached at origin/master You are currently cherry-picking commit fba0adb2b. (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: DEPS no changes added to commit (use "git add" and/or "git commit -a") ---------------------------------------- Error: Command 'git cherry-pick 277022e0e51ae646448daf2d36a81502b8ac53b7..fba0adb2bed280a719a494f4edcb8092befe9d3a --keep-redundant-commits' returned non-zero exit status 1 in /b/s/w/ir/kitchen-workdir/native_client error: could not apply fba0adb2b... Stop passing no-op --if-needed to clang update script. 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'