Help
Change theme
Press space for more information.
Refresh (Shortcut: Shift+r)
Go home (Shortcut: u)
Copy issue ID
Show links for this issue (Shortcut: i, l)
Previous Issue (Shortcut: k)
Next Issue (Shortcut: j)
Sign in to use full features.
View issue level access limits(Press Alt + Right arrow for more information)
Pending code changes (auto-populated)
The version field defines the version of the software the bug was found in. [ID: 1154637]
Notification menu
Vote: I am impacted
Unintended behavior
View staffing
Description
Output ofhttps://gerrit.googlesource.com/git-repo )
repo --version
:repo version v2.31
(from
(tracking refs/heads/stable)
(Thu, 8 Dec 2022 17:17:30 +0000)
repo launcher version 2.30
(from /usr/bin/repo)
(currently at 2.31)
repo User-Agent git-repo/2.31 (Linux) git/2.34.1 Python/3.10.6
git 2.34.1
git User-Agent git/2.34.1 (Linux) git-repo/2.31
Python 3.10.6 (main, Nov 14 2022, 16:10:14) [GCC 11.3.0]
OS Linux 5.15.79.1-microsoft-standard-WSL2 (#1 SMP Wed Nov 23 01:01:46 UTC 2022)
CPU x86_64 (x86_64)
Manifest URL (if publicly available):
What steps will reproduce the problem?
1. Fresh repo sync for master branch of AOSP
2. cd frameworks/native/
3. repo download -c platform/frameworks/native 2120296
What is the expected output?https://android-review.googlesource.com/c/platform/frameworks/native/+/2120296/2
Repo to cherry pick the commit for patchset 2 from
What do you see instead?https://android.googlesource.com/platform/frameworks/native
Defaulting to cwd project platform/frameworks/native
From
* branch refs/changes/96/2120296/2 -> FETCH_HEAD
error: commit ae1dbe946276efa3de50bc13f5184cd5a2689333 is a merge but no -m option was given.
fatal: cherry-pick failed
[platform/frameworks/native] Could not complete the cherry-pick of ae1dbe946276efa3de50bc13f5184cd5a2689333
Please provide any additional information below. Did this use to work?https://android-review.googlesource.com/c/platform/frameworks/native/+/2120296/2
Link to commit I'm working with:
I can cherry pick other things like this with no problem, though that commit never had a merge conflicthttps://android-review.googlesource.com/c/platform/frameworks/base/+/2120295