Advertisement
Guest User

Untitled

a guest
Jul 24th, 2018
239
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 11.66 KB | None | 0 0
  1. yncing work tree: 100% (616/616), done.
  2.  
  3. remote: Counting objects: 33704, done
  4. remote: Finding sources: 100% (7/7)
  5. remote: Total 7 (delta 4), reused 7 (delta 4)
  6. Unpacking objects: 100% (7/7), done.
  7. From http://review.carbonrom.org/CarbonROM/android_frameworks_base
  8. * branch refs/changes/18/7418/1 -> FETCH_HEAD
  9. [detached HEAD e16fb2a] media: Add the possibility to ignore specfic media codecs
  10. Author: Max Weffers <rcstar6696@gmail.com>
  11. Date: Mon Jul 23 11:35:29 2018 +0200
  12. 1 file changed, 31 insertions(+), 2 deletions(-)
  13. remote: Counting objects: 33718, done
  14. remote: Finding sources: 100% (21/21)
  15. remote: Total 21 (delta 14), reused 21 (delta 14)
  16. Unpacking objects: 100% (21/21), done.
  17. From http://review.carbonrom.org/CarbonROM/android_frameworks_base
  18. * branch refs/changes/19/7419/1 -> FETCH_HEAD
  19. [detached HEAD a0f2867] build: Spilt security patch into system and Vendor security patch
  20. Author: Max Weffers <rcstar6696@gmail.com>
  21. Date: Mon Jul 23 11:49:29 2018 +0200
  22. 2 files changed, 26 insertions(+), 1 deletion(-)
  23. remote: Counting objects: 33732, done
  24. remote: Finding sources: 100% (35/35)
  25. remote: Total 35 (delta 23), reused 33 (delta 23)
  26. Unpacking objects: 100% (35/35), done.
  27. From http://review.carbonrom.org/CarbonROM/android_frameworks_base
  28. * branch refs/changes/12/6412/23 -> FETCH_HEAD
  29. [detached HEAD 13ca64e] SystemUI: QS: add power tile
  30. Author: darjwx <darjwx@gmail.com>
  31. Date: Mon Apr 2 16:33:18 2018 +0200
  32. 14 files changed, 395 insertions(+), 2 deletions(-)
  33. create mode 100644 packages/SystemUI/res/drawable/ic_qs_power.xml
  34. create mode 100644 packages/SystemUI/res/drawable/ic_qs_power_bootloader.xml
  35. create mode 100644 packages/SystemUI/res/drawable/ic_qs_power_recovery.xml
  36. create mode 100644 packages/SystemUI/res/drawable/ic_qs_power_system.xml
  37. create mode 100644 packages/SystemUI/res/drawable/ic_qs_preferences.xml
  38. create mode 100644 packages/SystemUI/res/drawable/ic_qs_reboot.xml
  39. create mode 100644 packages/SystemUI/res/layout/qs_power_detail_view.xml
  40. create mode 100644 packages/SystemUI/src/com/android/systemui/qs/tiles/PowerTile.java
  41. ./sync.sh: line 13: cd: frameworks/av: No such file or directory
  42. warning: no common commits
  43. remote: Counting objects: 3790, done
  44. remote: Finding sources: 100% (183045/183045)
  45. remote: Total 183045 (delta 129825), reused 182907 (delta 129825)
  46. Receiving objects: 100% (183045/183045), 44.95 MiB | 9.09 MiB/s, done.
  47. Resolving deltas: 100% (129825/129825), done.
  48. From http://review.carbonrom.org/CarbonROM/android_frameworks_av
  49. * branch refs/changes/03/7203/1 -> FETCH_HEAD
  50. error: could not apply 3f2a260... Screenrecorder: Add a prop to use Google avc decorder in screenrecord
  51. hint: after resolving the conflicts, mark the corrected paths
  52. hint: with 'git add <paths>' or 'git rm <paths>'
  53. hint: and commit the result with 'git commit'
  54. warning: no common commits
  55. remote: Counting objects: 3795, done
  56. remote: Finding sources: 100% (183050/183050)
  57. remote: Total 183050 (delta 129828), reused 182911 (delta 129828)
  58. Receiving objects: 100% (183050/183050), 44.97 MiB | 17.87 MiB/s, done.
  59. Resolving deltas: 100% (129828/129828), done.
  60. From http://review.carbonrom.org/CarbonROM/android_frameworks_av
  61. * branch refs/changes/04/7204/1 -> FETCH_HEAD
  62. error: cherry-pick is not possible because you have unmerged files.
  63. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  64. hint: as appropriate to mark resolution and make a commit.
  65. fatal: cherry-pick failed
  66. warning: no common commits
  67. remote: Counting objects: 3800, done
  68. remote: Finding sources: 100% (183055/183055)
  69. remote: Total 183055 (delta 129831), reused 182915 (delta 129831)
  70. Receiving objects: 100% (183055/183055), 45.03 MiB | 13.77 MiB/s, done.
  71. Resolving deltas: 100% (129831/129831), done.
  72. From http://review.carbonrom.org/CarbonROM/android_frameworks_av
  73. * branch refs/changes/05/7205/1 -> FETCH_HEAD
  74. error: cherry-pick is not possible because you have unmerged files.
  75. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  76. hint: as appropriate to mark resolution and make a commit.
  77. fatal: cherry-pick failed
  78.  
  79. warning: no common commits
  80. remote: Counting objects: 3685, done
  81. remote: Finding sources: 100% (183124/183124)
  82. remote: Total 183124 (delta 129884), reused 182986 (delta 129884)
  83. Receiving objects: 100% (183124/183124), 44.99 MiB | 12.41 MiB/s, done.
  84. Resolving deltas: 100% (129884/129884), done.
  85. From http://review.carbonrom.org/CarbonROM/android_frameworks_av
  86. * branch refs/changes/21/7421/1 -> FETCH_HEAD
  87. error: cherry-pick is not possible because you have unmerged files.
  88. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  89. hint: as appropriate to mark resolution and make a commit.
  90. fatal: cherry-pick failed
  91. ./sync.sh: line 20: cd: frameworks/native: No such file or directory
  92. warning: no common commits
  93. remote: Counting objects: 2039, done
  94. remote: Finding sources: 100% (141956/141956)
  95. remote: Total 141956 (delta 69773), reused 141824 (delta 69773)
  96. Receiving objects: 100% (141956/141956), 47.61 MiB | 17.72 MiB/s, done.
  97. Resolving deltas: 100% (69773/69773), done.
  98. From http://review.carbonrom.org/CarbonROM/android_frameworks_native
  99. * branch refs/changes/67/5967/1 -> FETCH_HEAD
  100. error: cherry-pick is not possible because you have unmerged files.
  101. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  102. hint: as appropriate to mark resolution and make a commit.
  103. fatal: cherry-pick failed
  104. warning: no common commits
  105. remote: Counting objects: 2258, done
  106. remote: Finding sources: 100% (142005/142005)
  107. remote: Total 142005 (delta 69806), reused 141873 (delta 69806)
  108. Receiving objects: 100% (142005/142005), 47.62 MiB | 8.51 MiB/s, done.
  109. Resolving deltas: 100% (69806/69806), done.
  110. From http://review.carbonrom.org/CarbonROM/android_frameworks_native
  111. * branch refs/changes/06/7206/1 -> FETCH_HEAD
  112. error: cherry-pick is not possible because you have unmerged files.
  113. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  114. hint: as appropriate to mark resolution and make a commit.
  115. fatal: cherry-pick failed
  116. ./sync.sh: line 24: cd: frameworks/opt/telephony: No such file or directory
  117. warning: no common commits
  118. remote: Counting objects: 78924, done
  119. remote: Finding sources: 100% (78924/78924)
  120. remote: Total 78924 (delta 30364), reused 78311 (delta 30364)
  121. Receiving objects: 100% (78924/78924), 16.11 MiB | 4.02 MiB/s, done.
  122. Resolving deltas: 100% (30364/30364), done.
  123. From http://review.carbonrom.org/CarbonROM/android_frameworks_opt_telephony
  124. * branch refs/changes/74/7074/2 -> FETCH_HEAD
  125. error: cherry-pick is not possible because you have unmerged files.
  126. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  127. hint: as appropriate to mark resolution and make a commit.
  128. fatal: cherry-pick failed
  129. ./sync.sh: line 27: cd: packages/apps/Camera2: No such file or directory
  130. GitLab: The project you were looking for could not be found.
  131. fatal: Could not read from remote repository.
  132.  
  133. Please make sure you have the correct access rights
  134. and the repository exists.
  135. fatal: bad object a89c01ab037c561c76046b4f41ab38d955731b5e
  136. ./sync.sh: line 31: cd: system/vold: No such file or directory
  137. warning: no common commits
  138. remote: Counting objects: 142, done
  139. remote: Finding sources: 100% (4858/4858)
  140. remote: Total 4858 (delta 2758), reused 4742 (delta 2758)
  141. Receiving objects: 100% (4858/4858), 2.85 MiB | 0 bytes/s, done.
  142. Resolving deltas: 100% (2758/2758), done.
  143. From http://review.carbonrom.org/CarbonROM/android_system_vold
  144. * branch refs/changes/68/5868/1 -> FETCH_HEAD
  145. error: cherry-pick is not possible because you have unmerged files.
  146. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  147. hint: as appropriate to mark resolution and make a commit.
  148. fatal: cherry-pick failed
  149. warning: no common commits
  150. remote: Counting objects: 145, done
  151. remote: Finding sources: 100% (4861/4861)
  152. remote: Total 4861 (delta 2760), reused 4745 (delta 2760)
  153. Receiving objects: 100% (4861/4861), 2.86 MiB | 0 bytes/s, done.
  154. Resolving deltas: 100% (2760/2760), done.
  155. From http://review.carbonrom.org/CarbonROM/android_system_vold
  156. * branch refs/changes/69/5869/1 -> FETCH_HEAD
  157. error: cherry-pick is not possible because you have unmerged files.
  158. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  159. hint: as appropriate to mark resolution and make a commit.
  160. fatal: cherry-pick failed
  161. warning: no common commits
  162. remote: Counting objects: 194, done
  163. remote: Finding sources: 100% (4876/4876)
  164. remote: Total 4876 (delta 2768), reused 4759 (delta 2768)
  165. Receiving objects: 100% (4876/4876), 2.86 MiB | 0 bytes/s, done.
  166. Resolving deltas: 100% (2768/2768), done.
  167. From http://review.carbonrom.org/CarbonROM/android_system_vold
  168. * branch refs/changes/22/7422/3 -> FETCH_HEAD
  169. error: cherry-pick is not possible because you have unmerged files.
  170. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  171. hint: as appropriate to mark resolution and make a commit.
  172. fatal: cherry-pick failed
  173. ./sync.sh: line 40: cd: external/selinux: No such file or directory
  174. warning: no common commits
  175. remote: Counting objects: 17413, done
  176. remote: Finding sources: 100% (17413/17413)
  177. remote: Total 17413 (delta 12547), reused 17360 (delta 12547)
  178. Receiving objects: 100% (17413/17413), 9.82 MiB | 12.62 MiB/s, done.
  179. Resolving deltas: 100% (12547/12547), done.
  180. From http://review.carbonrom.org/CarbonROM/android_external_selinux
  181. * branch refs/changes/99/6499/1 -> FETCH_HEAD
  182. error: cherry-pick is not possible because you have unmerged files.
  183. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  184. hint: as appropriate to mark resolution and make a commit.
  185. fatal: cherry-pick failed
  186. ./sync.sh: line 43: cd: system/core: No such file or directory
  187. warning: no common commits
  188. remote: Counting objects: 1697, done
  189. remote: Finding sources: 100% (107870/107870)
  190. remote: Total 107870 (delta 63160), reused 107674 (delta 63160)
  191. Receiving objects: 100% (107870/107870), 33.55 MiB | 12.84 MiB/s, done.
  192. Resolving deltas: 100% (63160/63160), done.
  193. From http://review.carbonrom.org/CarbonROM/android_system_core
  194. * branch refs/changes/67/5867/3 -> FETCH_HEAD
  195. error: cherry-pick is not possible because you have unmerged files.
  196. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  197. hint: as appropriate to mark resolution and make a commit.
  198. fatal: cherry-pick failed
  199. warning: no common commits
  200. remote: Counting objects: 1860, done
  201. remote: Finding sources: 100% (107900/107900)
  202. remote: Total 107900 (delta 63174), reused 107704 (delta 63174)
  203. Receiving objects: 100% (107900/107900), 33.56 MiB | 17.29 MiB/s, done.
  204. Resolving deltas: 100% (63174/63174), done.
  205. From http://review.carbonrom.org/CarbonROM/android_system_core
  206. * branch refs/changes/07/7207/1 -> FETCH_HEAD
  207. error: cherry-pick is not possible because you have unmerged files.
  208. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  209. hint: as appropriate to mark resolution and make a commit.
  210. fatal: cherry-pick failed
  211. ./sync.sh: line 47: cd: system/netd: No such file or directory
  212. warning: no common commits
  213. remote: Counting objects: 7061, done.
  214. remote: Compressing objects: 100% (38/38), done.
  215. remote: Total 7061 (delta 232), reused 205 (delta 201), pack-reused 6822
  216. Receiving objects: 100% (7061/7061), 2.50 MiB | 0 bytes/s, done.
  217. Resolving deltas: 100% (3947/3947), done.
  218. From https://github.com/phhusson/platform_system_netd
  219. * branch android-8.1.0_r36-phh -> FETCH_HEAD
  220. error: cherry-pick is not possible because you have unmerged files.
  221. hint: Fix them up in the work tree, and then use 'git add/rm <file>'
  222. fatal: cherry-pick failed
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement