/b/s/w/ir/k/cipd/jiri/jiri patch -vv -time '-j=50' -host
https://fuchsia-review.googlesource.com -project fuchsia '-rebase=true' refs/changes/64/284864/3
in dir /b/s/w/ir/k:
allow_subannotations: False
cmd: ['/b/s/w/ir/k/cipd/jiri/jiri',
'patch',
'-vv',
'-time',
'-j=50',
'-host',
'
https://fuchsia-review.googlesource.com',
'-project',
'fuchsia',
'-rebase=true',
'refs/changes/64/284864/3']
env: {}
env_prefixes: {}
env_suffixes: {}
infra_step: True
name_tokens: ('checkout', 'jiri patch')
ok_ret: frozenset([0])
trigger_specs: ()
full environment:
BOTO_CONFIG: /b/s/w/ir/tmp/gsutil-task/.boto
BUILDBUCKET_EXPERIMENTAL: FALSE
CIPD_CACHE_DIR: /b/s/cipd_cache/cache
CIPD_PROTOCOL: v2
DEVSHELL_CLIENT_PORT: 41457
DOCKER_CONFIG: /b/s/w/ir/tmp/docker-cfg-task
DOCKER_TMPDIR: /b/s/w/ir/tmp/docker-tmp-task
GIT_CONFIG_NOSYSTEM: 1
GIT_TERMINAL_PROMPT: 0
HOME: /home/swarming
INFRA_GIT_WRAPPER_HOME: /b/s/w/ir/tmp/git-home-task
INVOCATION_ID: 2fd695439b204279bc5365b6e3904a2b
JOURNAL_STREAM: 8:24785
LANG: en_US.UTF-8
LOGDOG_COORDINATOR_HOST: logs.chromium.org
LOGDOG_STREAM_PREFIX: buildbucket/cr-buildbucket.appspot.com/8912562205712984704
LOGDOG_STREAM_PROJECT: fuchsia
LOGDOG_STREAM_SERVER_PATH: unix:/b/s/w/ir/tmp/ld.sock
LOGNAME: swarming
LUCI_CONTEXT: /b/s/w/ir/tmp/luci_context.403302333
MAC_CHROMIUM_TMPDIR: /b/s/w/ir/tmp/t
NO_GCE_CHECK: False
PATH: /b/s/w/ir/cipd_bin_packages:/b/s/w/ir/cipd_bin_packages/bin:/b/s/cipd_cache/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PWD: /b/s/w/ir/k
PYTHONIOENCODING: UTF-8
PYTHONUNBUFFERED: 1
SHELL: /bin/bash
SHLVL: 1
SWARMING_BOT_ID: fuchsia-try-16-us-central1-c-107-x5os
SWARMING_EXTERNAL_BOT_SETUP: 1
SWARMING_HEADLESS: 1
SWARMING_SERVER:
https://chromium-swarm.appspot.com
SWARMING_TASK_ID: 45037e62197d7011
TEMP: /b/s/w/ir/tmp/t
TEMPDIR: /b/s/w/ir/tmp/t
TMP: /b/s/w/ir/tmp/t
TMPDIR: /b/s/w/ir/tmp/t
USER: swarming
VPYTHON_VIRTUALENV_ROOT: /b/s/w/ir/cache/vpython
_: /b/s/w/ir/cipd_bin_packages/vpython
TRACE: Run: git rev-list -n 1 HEAD (/b/s/w/ir/k)
TRACE: Run: git rev-list -n 1 HEAD (/b/s/w/ir/k/integration)
Patching project fuchsia(/b/s/w/ir/k) on branch "change/284864/3" to ref "refs/changes/64/284864/3"
TRACE: Run: git rev-parse --verify --quiet change/284864/3 (/b/s/w/ir/k)
TRACE: Run: git fetch origin refs/changes/64/284864/3 (/b/s/w/ir/k)
TRACE: Run: git branch change/284864/3 FETCH_HEAD (/b/s/w/ir/k)
TRACE: Run: git branch -u origin/master change/284864/3 (/b/s/w/ir/k)
TRACE: Run: git checkout change/284864/3 (/b/s/w/ir/k)
Project patched
Rebasing project fuchsia(/b/s/w/ir/k)
TRACE: Run: git log -n 1 --format=format:%cn:%ce HEAD (/b/s/w/ir/k)
TRACE: Run: git -c user.email=ghanan@google.com -c user.name=Ghanan Gowripalan fetch origin master (/b/s/w/ir/k)
TRACE: Run: git -c user.email=ghanan@google.com -c user.name=Ghanan Gowripalan rebase remotes/origin/master (/b/s/w/ir/k)
TRACE: Run: git -c user.email=ghanan@google.com -c user.name=Ghanan Gowripalan rebase --abort (/b/s/w/ir/k)
ERROR: Cannot rebase the change: 'git rebase remotes/origin/master' failed:
stdout:
First, rewinding head to replay your work on top of it...
Applying: [bluetooth] Start a Generic Access Service per adapter
Using index info to reconstruct a base tree...
M src/connectivity/bluetooth/core/bt-host/gap/adapter.cc
M src/connectivity/bluetooth/core/bt-host/host.cc
Falling back to patching base and 3-way merge...
Auto-merging src/connectivity/bluetooth/core/bt-host/host.cc
CONFLICT (content): Merge conflict in src/connectivity/bluetooth/core/bt-host/host.cc
Auto-merging src/connectivity/bluetooth/core/bt-host/gap/adapter.cc
Patch failed at 0001 [bluetooth] Start a Generic Access Service per adapter
Resolve all conflicts manually, mark them as resolved with
"git add/rm <conflicted_files>", then run "git rebase --continue".
You can instead skip this commit: run "git rebase --skip".
To abort and get back to the state before "git rebase", run "git rebase --abort".
stderr:
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch' to see the failed patch
command fail error: exit status 1
16:30:59.523 jiri 5.158s 16:31:04.681
16:30:59.523 cmdline parse 0.000s 16:30:59.523
16:30:59.523 cmdline run 5.158s 16:31:04.681
16:30:59.523 find .jiri_root 0.000s 16:30:59.523
16:30:59.523 local projects 0.016s 16:30:59.540
16:30:59.523 * 0.001s 16:30:59.525
16:30:59.525 load .jiri_root/update_history/latest 0.001s 16:30:59.526
16:30:59.526 match manifest 0.000s 16:30:59.526
16:30:59.526 set revisions 0.014s 16:30:59.540
16:30:59.540 * 5.141s 16:31:04.681
step returned non-zero exit code: 24