Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- yncing work tree: 100% (616/616), done.
- remote: Counting objects: 33704, done
- remote: Finding sources: 100% (7/7)
- remote: Total 7 (delta 4), reused 7 (delta 4)
- Unpacking objects: 100% (7/7), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_base
- * branch refs/changes/18/7418/1 -> FETCH_HEAD
- [detached HEAD e16fb2a] media: Add the possibility to ignore specfic media codecs
- Author: Max Weffers <rcstar6696@gmail.com>
- Date: Mon Jul 23 11:35:29 2018 +0200
- 1 file changed, 31 insertions(+), 2 deletions(-)
- remote: Counting objects: 33718, done
- remote: Finding sources: 100% (21/21)
- remote: Total 21 (delta 14), reused 21 (delta 14)
- Unpacking objects: 100% (21/21), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_base
- * branch refs/changes/19/7419/1 -> FETCH_HEAD
- [detached HEAD a0f2867] build: Spilt security patch into system and Vendor security patch
- Author: Max Weffers <rcstar6696@gmail.com>
- Date: Mon Jul 23 11:49:29 2018 +0200
- 2 files changed, 26 insertions(+), 1 deletion(-)
- remote: Counting objects: 33732, done
- remote: Finding sources: 100% (35/35)
- remote: Total 35 (delta 23), reused 33 (delta 23)
- Unpacking objects: 100% (35/35), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_base
- * branch refs/changes/12/6412/23 -> FETCH_HEAD
- [detached HEAD 13ca64e] SystemUI: QS: add power tile
- Author: darjwx <darjwx@gmail.com>
- Date: Mon Apr 2 16:33:18 2018 +0200
- 14 files changed, 395 insertions(+), 2 deletions(-)
- create mode 100644 packages/SystemUI/res/drawable/ic_qs_power.xml
- create mode 100644 packages/SystemUI/res/drawable/ic_qs_power_bootloader.xml
- create mode 100644 packages/SystemUI/res/drawable/ic_qs_power_recovery.xml
- create mode 100644 packages/SystemUI/res/drawable/ic_qs_power_system.xml
- create mode 100644 packages/SystemUI/res/drawable/ic_qs_preferences.xml
- create mode 100644 packages/SystemUI/res/drawable/ic_qs_reboot.xml
- create mode 100644 packages/SystemUI/res/layout/qs_power_detail_view.xml
- create mode 100644 packages/SystemUI/src/com/android/systemui/qs/tiles/PowerTile.java
- ./sync.sh: line 13: cd: frameworks/av: No such file or directory
- warning: no common commits
- remote: Counting objects: 3790, done
- remote: Finding sources: 100% (183045/183045)
- remote: Total 183045 (delta 129825), reused 182907 (delta 129825)
- Receiving objects: 100% (183045/183045), 44.95 MiB | 9.09 MiB/s, done.
- Resolving deltas: 100% (129825/129825), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_av
- * branch refs/changes/03/7203/1 -> FETCH_HEAD
- error: could not apply 3f2a260... Screenrecorder: Add a prop to use Google avc decorder in screenrecord
- 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'
- warning: no common commits
- remote: Counting objects: 3795, done
- remote: Finding sources: 100% (183050/183050)
- remote: Total 183050 (delta 129828), reused 182911 (delta 129828)
- Receiving objects: 100% (183050/183050), 44.97 MiB | 17.87 MiB/s, done.
- Resolving deltas: 100% (129828/129828), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_av
- * branch refs/changes/04/7204/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- warning: no common commits
- remote: Counting objects: 3800, done
- remote: Finding sources: 100% (183055/183055)
- remote: Total 183055 (delta 129831), reused 182915 (delta 129831)
- Receiving objects: 100% (183055/183055), 45.03 MiB | 13.77 MiB/s, done.
- Resolving deltas: 100% (129831/129831), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_av
- * branch refs/changes/05/7205/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- warning: no common commits
- remote: Counting objects: 3685, done
- remote: Finding sources: 100% (183124/183124)
- remote: Total 183124 (delta 129884), reused 182986 (delta 129884)
- Receiving objects: 100% (183124/183124), 44.99 MiB | 12.41 MiB/s, done.
- Resolving deltas: 100% (129884/129884), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_av
- * branch refs/changes/21/7421/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- ./sync.sh: line 20: cd: frameworks/native: No such file or directory
- warning: no common commits
- remote: Counting objects: 2039, done
- remote: Finding sources: 100% (141956/141956)
- remote: Total 141956 (delta 69773), reused 141824 (delta 69773)
- Receiving objects: 100% (141956/141956), 47.61 MiB | 17.72 MiB/s, done.
- Resolving deltas: 100% (69773/69773), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_native
- * branch refs/changes/67/5967/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- warning: no common commits
- remote: Counting objects: 2258, done
- remote: Finding sources: 100% (142005/142005)
- remote: Total 142005 (delta 69806), reused 141873 (delta 69806)
- Receiving objects: 100% (142005/142005), 47.62 MiB | 8.51 MiB/s, done.
- Resolving deltas: 100% (69806/69806), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_native
- * branch refs/changes/06/7206/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- ./sync.sh: line 24: cd: frameworks/opt/telephony: No such file or directory
- warning: no common commits
- remote: Counting objects: 78924, done
- remote: Finding sources: 100% (78924/78924)
- remote: Total 78924 (delta 30364), reused 78311 (delta 30364)
- Receiving objects: 100% (78924/78924), 16.11 MiB | 4.02 MiB/s, done.
- Resolving deltas: 100% (30364/30364), done.
- From http://review.carbonrom.org/CarbonROM/android_frameworks_opt_telephony
- * branch refs/changes/74/7074/2 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- ./sync.sh: line 27: cd: packages/apps/Camera2: No such file or directory
- GitLab: The project you were looking for could not be found.
- fatal: Could not read from remote repository.
- Please make sure you have the correct access rights
- and the repository exists.
- fatal: bad object a89c01ab037c561c76046b4f41ab38d955731b5e
- ./sync.sh: line 31: cd: system/vold: No such file or directory
- warning: no common commits
- remote: Counting objects: 142, done
- remote: Finding sources: 100% (4858/4858)
- remote: Total 4858 (delta 2758), reused 4742 (delta 2758)
- Receiving objects: 100% (4858/4858), 2.85 MiB | 0 bytes/s, done.
- Resolving deltas: 100% (2758/2758), done.
- From http://review.carbonrom.org/CarbonROM/android_system_vold
- * branch refs/changes/68/5868/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- warning: no common commits
- remote: Counting objects: 145, done
- remote: Finding sources: 100% (4861/4861)
- remote: Total 4861 (delta 2760), reused 4745 (delta 2760)
- Receiving objects: 100% (4861/4861), 2.86 MiB | 0 bytes/s, done.
- Resolving deltas: 100% (2760/2760), done.
- From http://review.carbonrom.org/CarbonROM/android_system_vold
- * branch refs/changes/69/5869/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- warning: no common commits
- remote: Counting objects: 194, done
- remote: Finding sources: 100% (4876/4876)
- remote: Total 4876 (delta 2768), reused 4759 (delta 2768)
- Receiving objects: 100% (4876/4876), 2.86 MiB | 0 bytes/s, done.
- Resolving deltas: 100% (2768/2768), done.
- From http://review.carbonrom.org/CarbonROM/android_system_vold
- * branch refs/changes/22/7422/3 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- ./sync.sh: line 40: cd: external/selinux: No such file or directory
- warning: no common commits
- remote: Counting objects: 17413, done
- remote: Finding sources: 100% (17413/17413)
- remote: Total 17413 (delta 12547), reused 17360 (delta 12547)
- Receiving objects: 100% (17413/17413), 9.82 MiB | 12.62 MiB/s, done.
- Resolving deltas: 100% (12547/12547), done.
- From http://review.carbonrom.org/CarbonROM/android_external_selinux
- * branch refs/changes/99/6499/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- ./sync.sh: line 43: cd: system/core: No such file or directory
- warning: no common commits
- remote: Counting objects: 1697, done
- remote: Finding sources: 100% (107870/107870)
- remote: Total 107870 (delta 63160), reused 107674 (delta 63160)
- Receiving objects: 100% (107870/107870), 33.55 MiB | 12.84 MiB/s, done.
- Resolving deltas: 100% (63160/63160), done.
- From http://review.carbonrom.org/CarbonROM/android_system_core
- * branch refs/changes/67/5867/3 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- warning: no common commits
- remote: Counting objects: 1860, done
- remote: Finding sources: 100% (107900/107900)
- remote: Total 107900 (delta 63174), reused 107704 (delta 63174)
- Receiving objects: 100% (107900/107900), 33.56 MiB | 17.29 MiB/s, done.
- Resolving deltas: 100% (63174/63174), done.
- From http://review.carbonrom.org/CarbonROM/android_system_core
- * branch refs/changes/07/7207/1 -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- hint: as appropriate to mark resolution and make a commit.
- fatal: cherry-pick failed
- ./sync.sh: line 47: cd: system/netd: No such file or directory
- warning: no common commits
- remote: Counting objects: 7061, done.
- remote: Compressing objects: 100% (38/38), done.
- remote: Total 7061 (delta 232), reused 205 (delta 201), pack-reused 6822
- Receiving objects: 100% (7061/7061), 2.50 MiB | 0 bytes/s, done.
- Resolving deltas: 100% (3947/3947), done.
- From https://github.com/phhusson/platform_system_netd
- * branch android-8.1.0_r36-phh -> FETCH_HEAD
- error: cherry-pick is not possible because you have unmerged files.
- hint: Fix them up in the work tree, and then use 'git add/rm <file>'
- fatal: cherry-pick failed
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement