~/android/lineage$ repopick -t wsl-compile -f
Applying change number 208102...
!! Force-picking a closed change !!
--> Subject: "Adapt ijar for WSL"
--> Project path: build/make
--> Change number: 208102 (Patch Set 15)
['git fetch github', u'refs/changes/02/208102/15']
From
https://github.com/LineageOS/android_build
* branch refs/changes/02/208102/15 -> FETCH_HEAD
Not currently on any branch.
You are currently cherry-picking commit 14925d030.
nothing to commit, working tree clean
The previous cherry-pick is now empty, possibly due to conflict resolution.
If you wish to commit it anyway, use:
git commit --allow-empty
Otherwise, please use 'git reset'
WARNING: git command resulted with an empty commit, aborting cherry-pick
Applying change number 208328...
!! Force-picking a closed change !!
--> Subject: "Disable futexes on lxss"
--> Project path: art
--> Change number: 208328 (Patch Set 1)
['git fetch github', u'refs/changes/28/208328/1']
remote: Enumerating objects: 238579, done.
remote: Counting objects: 100% (238565/238565), done.
remote: Compressing objects: 100% (68981/68981), done.
remote: Total 235557 (delta 166696), reused 233466 (delta 164858), pack-reused 0
Receiving objects: 100% (235557/235557), 78.19 MiB | 1.88 MiB/s, done.
Resolving deltas: 100% (166696/166696), completed with 1928 local objects.
From
https://github.com/LineageOS/android_art
* branch refs/changes/28/208328/1 -> FETCH_HEAD
[detached HEAD d0bbc055b] Disable futexes on lxss
Author: Bryan Tong Minh <bryan.tongminh@gmail.com>
Date: Sat Jan 14 17:54:57 2017 +0100
1 file changed, 1 insertion(+), 1 deletion(-)
Applying change number 208384...
!! Force-picking a closed change !!
--> Subject: "Add detection for WSL"
--> Project path: build/make
--> Change number: 208384 (Patch Set 7)
['git fetch github', u'refs/changes/84/208384/7']
remote: Enumerating objects: 128192, done.
remote: Counting objects: 100% (128190/128190), done.
remote: Compressing objects: 100% (41796/41796), done.
remote: Total 127776 (delta 85417), reused 127390 (delta 85057), pack-reused 0
Receiving objects: 100% (127776/127776), 36.10 MiB | 1.57 MiB/s, done.
Resolving deltas: 100% (85417/85417), completed with 242 local objects.
From
https://github.com/LineageOS/android_build
* branch refs/changes/84/208384/7 -> FETCH_HEAD
error: could not apply bae4f40b9b... Add detection for WSL
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'
Recorded preimage for 'core/combo/HOST_linux-x86_64.mk'
Recorded preimage for 'core/envsetup.mk'
ERROR: git command failed