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_deps': { 'sdk/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@88229872dd17e71658fe96763feaa77915d8cbd6'}, 'deps_file': 'DEPS', 'managed': False, 'name': 'sdk', 'url': 'https://dart.googlesource.com/sdk.git'}] cache_dir = r"/b/s/w/ir/cache/git" target_os_only=False sdk ---------------------------------------- [0:00:00] Started. _____ sdk at refs/remotes/origin/master [0:00:00] ________ unmanaged solution; skipping sdk [0:00:00] ===Applying patch ref=== [0:00:00] Patch ref is 'https://dart.googlesource.com/sdk.git' @ 'refs/changes/02/82202/11'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'c0860645657e414b2557d9291318acbe9afd1556'. Current dir is '/b/s/w/ir/cache/builder/sdk' [0:00:01] Merge base of refs/remotes/origin/master and e0f554aa598df597f4c6d915c2cb6be7ce269937 is 022d181a4d08c683d75b188206557d031aef1246 [0:00:02] Failed to apply patch. [0:00:02] Patch ref is 'https://dart.googlesource.com/sdk.git' @ 'refs/changes/02/82202/11'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'c0860645657e414b2557d9291318acbe9afd1556'. Current dir is '/b/s/w/ir/cache/builder/sdk' [0:00:02] git returned non-zero exit status 1: error: could not apply e0f554aa59... [co19] DEPS updated to the latest co19_2 commit 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 at origin/master You are currently cherry-picking commit e0f554aa59. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: DEPS modified: tests/co19_2/co19_2-analyzer.status modified: tests/co19_2/co19_2-dart2js.status Unmerged paths: (use "git add <file>..." to mark resolution) both modified: tests/co19_2/co19_2-kernel.status ---------------------------------------- sdk (ERROR) ---------------------------------------- [0:00:00] Started. _____ sdk at refs/remotes/origin/master [0:00:00] ________ unmanaged solution; skipping sdk [0:00:00] ===Applying patch ref=== [0:00:00] Patch ref is 'https://dart.googlesource.com/sdk.git' @ 'refs/changes/02/82202/11'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'c0860645657e414b2557d9291318acbe9afd1556'. Current dir is '/b/s/w/ir/cache/builder/sdk' [0:00:01] Merge base of refs/remotes/origin/master and e0f554aa598df597f4c6d915c2cb6be7ce269937 is 022d181a4d08c683d75b188206557d031aef1246 [0:00:02] Failed to apply patch. [0:00:02] Patch ref is 'https://dart.googlesource.com/sdk.git' @ 'refs/changes/02/82202/11'. Target branch for patch is 'refs/remotes/origin/master'. Current HEAD is 'c0860645657e414b2557d9291318acbe9afd1556'. Current dir is '/b/s/w/ir/cache/builder/sdk' [0:00:02] git returned non-zero exit status 1: error: could not apply e0f554aa59... [co19] DEPS updated to the latest co19_2 commit 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 at origin/master You are currently cherry-picking commit e0f554aa59. (fix conflicts and run "git cherry-pick --continue") (use "git cherry-pick --abort" to cancel the cherry-pick operation) Changes to be committed: modified: DEPS modified: tests/co19_2/co19_2-analyzer.status modified: tests/co19_2/co19_2-dart2js.status Unmerged paths: (use "git add <file>..." to mark resolution) both modified: tests/co19_2/co19_2-kernel.status ---------------------------------------- Error: Command 'git cherry-pick 022d181a4d08c683d75b188206557d031aef1246..e0f554aa598df597f4c6d915c2cb6be7ce269937 --keep-redundant-commits' returned non-zero exit status 1 in /b/s/w/ir/cache/builder/sdk error: could not apply e0f554aa59... [co19] DEPS updated to the latest co19_2 commit 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'