Ok guys total git and gerrit noob here. im trying to learn to be able to upload to cyanogenmod gerrit so i can help out with some dev.
i have done:
signed up for cm gerrit
added my ssh key
setup git config to cm gerrit with my username and email that i used to signup with cm gerrit
all good so far. I synced up cm-13.0 sources. i repo cloned my device tree (which was from cyanogemod github).
i go
repo start cm-13.0 device/huawei/angler
it comes up with
error: project device/huawei/angler not found
if anyone can help me learn to be able to push commits for review i would very much appreciate it
Hello winxuser,
go into the directory you want to push to and make your changes. Commit them and push to CyanogenMod Gerrit:
git push ssh://[email protected]:29418/CyanogenMod/android_device_huawei_angler HEAD:refs/for/cm-13.0
(Replace your username with the one you choose while you registered.) I am pusing to AICP Gerrit every day. If I use repo start, it don't work for me too.
git push ssh://[email protected]:29418/CyanogenMod/device_huawei_angler HEAD:refs/for/cm-13.0
fatal: Project not found: CyanogenMod/device_huawei_angler
fatal: Could not read from remote repository.
Please make sure you have the correct access rights
and the repository exists.
Then:
git push ssh://[email protected]:29418/CyanogenMod/android_device_huawei_angler HEAD:refs/for/cm-13.0
Sorry, AICP is using another file structure.
Trafalgar Square said:
Then:
git push ssh://[email protected]:29418/CyanogenMod/android_device_huawei_angler HEAD:refs/for/cm-13.0
Sorry, AICP is using another file structure.
Click to expand...
Click to collapse
Ohh woops yes I forgot the android part hahaha,, well I was going to push the changes but I noticed none of the other nexus devices have it so I'm not sure
Sent from my Nexus 6P using XDA-Developers mobile app
I compiled angler cm using XXXHDPI dalvik heap and hwui, instead of xhdpi dalvik.. Just not sure what the advantage of that would be.. Just figured it would be better setting the dalvik up as xxxhdpi, it is a xxxhdpi device with 3gb ram
Sent from my Nexus 6P using XDA-Developers mobile app
ok change has been made and uploaded to gerrit,, what if i have missed something and i need to update it, how to i make patchsets?
Sorry, I don't know about patch sets.
But...
http://stackoverflow.com/questions/16118947/how-to-create-a-new-patchset-in-gerrit
Its all good I figured it out thanks for your help
Sent from my Nexus 6P using XDA-Developers mobile app
Sure man.
You helped a lot with your ROMs in Galaxy S3 LTE section and now I helped you
Trafalgar Square said:
Sure man.
You helped a lot with your ROMs in Galaxy S3 LTE section and now I helped you
Click to expand...
Click to collapse
Oh that's where I remember your name from.. I would of continued the work there but the phone that got donated to me the backlight ended up dying on it so I couldn't use it
Sent from my Nexus 6P using XDA-Developers mobile app
Related
i want to download the CyanogenMod 10.2 source code. I searched a lot for this. As far I have known I have to use the following to initialize the repository:
Code:
$ cd ~/android/system/
$ repo init -u git://github.com/CyanogenMod/android.git -b cm-10.1
But the above one is for CyanogenMod 10.1 as there is cm-10.1 at the end of the code. should I use cm-10.2 to initialize the repository for CM 10.2? or is there any other method. Please help me.
I've even asked the same question in other threads but did not got any replies or help....
Plz anyone help me for this..
Yes, you need to add the cm-10.2 at the end to get the 10.2 repo. take a look at their readme on the github page, here is the link https://github.com/CyanogenMod/android
netwokz said:
Yes, you need to add the cm-10.2 at the end to get the 10.2 repo. take a look at their readme on the github page, here is the link https://github.com/CyanogenMod/android
Click to expand...
Click to collapse
I was too thinking of doing that but didn't find it anywhere.. Thanks a lot for your help.
netwokz said:
Yes, you need to add the cm-10.2 at the end to get the 10.2 repo. take a look at their readme on the github page, here is the link https://github.com/CyanogenMod/android
Click to expand...
Click to collapse
Can u also tell me, what might be the size of the source code, is it 20-30 GB. Or greater than that?
I want to say mine was between 15-20GB, but I would expect 20-30 to be on the safe side.
netwokz said:
I want to say mine was between 15-20GB, but I would expect 20-30 to be on the safe side.
Click to expand...
Click to collapse
15-20 GB of Cyanogenmod 10.2? really?
looks like I was off, my CyanogeMod folder for 10.2 is about 10GB. but it all depends on where you get it from, extra devices and or files might be included in the manifest, that you won't need.
netwokz said:
looks like I was off, my CyanogeMod folder for 10.2 is about 10GB. but it all depends on where you get it from, extra devices and or files might be included in the manifest, that you won't need.
Click to expand...
Click to collapse
ya right, finally i've got ready to download the source code, after that will make few commits and after that will try to add HALO for my Samsung Galaxy S3. Thanks for all your help.. And also it would be very nice for me if you could share my website on android, just started, still need improvements: http://technoxist.com/ Could you please help me making it more better?? If you can plz send me PM..
This helped
suyash1629 said:
15-20 GB of Cyanogenmod 10.2? really?
Click to expand...
Click to collapse
My build folder is about 15GB - that sounds about right.
fadedout said:
My build folder is about 15GB - that sounds about right.
Click to expand...
Click to collapse
I have both CM 10.2 and CM 11. I think build folder doesn't matter that much but the .repo folder size matter for the size of source code. .repo folder contains the source code which is synced to working directory when downloading source code is complete ,so the source code size will be of around 6-11GB according to the amdroid version you are downloading. My CM 10.2 source code size is about 6.8GB (.repo folder) and CM 11 is about 11GB. in both cases the size is of .repo folder
Hello everyone!
I present to you a paranoid android 3.99 port for our Xperia SP
Changelog:
V2: Device no longer hard reboots on bootanimation
V1: initial release
BUGS:
V2: Device doesn't boot (stuck on bootanimation and ADB offline)
V1: Device doesn't boot (hard reboot after 10 seconds of showing splash screen)
Download: PA_HUASHAN_V2
Now as you can see this ROM port is not booting but at least it doesn't do a hard reboot anymore! Currently I have no ADB access as it is listed as offline when doing: ADB devices of course I can't figure out the problem myself so I'm asking you guys for help. Since there is no logcat I know that it might be nasty to determine the problem and where the phone stops booting. I hope you guys can help me get this ROM to boot so we will finally have a working PA rom
thanks to: @-NickHalden- for his nice guide on how to port ROM's
@FXP for the base rom (cm10.2)
and the paranoid android team for the ROM that was ported (pa 3.99 from nexus 4)
Why don't you simply build from source?
kamarush said:
Why don't you simply build from source?
Click to expand...
Click to collapse
I'm trying that as well but i'm having some issues getting these files working
<device>.adds
<device>.removes
pa_<device>.conf
pa_<device>.mk
If I could easily get/make these files a source build would already be here
Do you have a idea on how to create these files? or where I can get them?
for example for the .adds file I need something like this (this comes from nexus 4)
https://github.com/ParanoidAndroid/android_vendor_pa/blob/jb43/manifests/mako.adds
It's pretty simple
Adds and removes are the repos what you need and don't need. About the makefiles. You can simple use the mako files as base, only need to change the values to match for our device.
kamarush said:
It's pretty simple
Adds and removes are the repos what you need and don't need. About the makefiles. You can simple use the mako files as base, only need to change the values to match for our device.
Click to expand...
Click to collapse
OK this is the .adds file I just made can you take a look at it?
huashan.adds
kamarush said:
Why don't you simply build from source?
Click to expand...
Click to collapse
A long ago, i dont have see you on xda....
now you've back....great master
OK guys PA is currently building from source! now let's prepare to wait a long time xD
noahvt said:
OK this is the .adds file I just made can you take a look at it?
huashan.adds
Click to expand...
Click to collapse
This file will be almost the same as the cm dependencies. So this isn't good.
Levered said:
A long ago, i dont have see you on xda....
now you've back....great master
Click to expand...
Click to collapse
Yeah was long time ago i just bought this device a week ago. I just came back to Sony from Samsung
noahvt said:
OK guys PA is currently building from source! now let's prepare to wait a long time xD
Click to expand...
Click to collapse
@kamarush
damn I ran into some building issues already (hopefully nothing to serious)
Lunching device
build/core/product_config.mk:231: *** device/sample/products/pa_huashan.mk: PRODUCT_NAME must be defined.. Stop.
Device huashan not found. Attempting to retrieve device repository from ParanoidAndroid Github (http://github.com/ParanoidAndroid).
Repository for huashan not found in the ParanoidAndroid Github repository list. If this is in error, you may need to manually add it to your local_manifest.xml.
build/core/product_config.mk:231: *** device/sample/products/pa_huashan.mk: PRODUCT_NAME must be defined.. Stop.
** Don't have a product spec for: 'pa_huashan'
** Do you have the right repo manifest?
i'll upload my "pa_huashan.mk" file: https://mega.co.nz/#!gZESjTKQ!ESlhCwWQROoh53SFYJ5vqyA177o5jqZdy9V688BWUNs
EDIT: I modified my huashan.adds file
EDIT2: I really needs some help with this! I'm familiar with the compiling process of cyanogenmod but this is a whole new story
I'm a huge fan of PA, I hope this one for our SP will progress nicely. Keep up the good work devs. Currently on CM coz stock is too laggy on my one.
Tapatalked from my Xperia P
noahvt said:
@kamarush
damn I ran into some building issues already (hopefully nothing to serious)
Lunching device
build/core/product_config.mk:231: *** device/sample/products/pa_huashan.mk: PRODUCT_NAME must be defined.. Stop.
Device huashan not found. Attempting to retrieve device repository from ParanoidAndroid Github (http://github.com/ParanoidAndroid).
Repository for huashan not found in the ParanoidAndroid Github repository list. If this is in error, you may need to manually add it to your local_manifest.xml.
build/core/product_config.mk:231: *** device/sample/products/pa_huashan.mk: PRODUCT_NAME must be defined.. Stop.
** Don't have a product spec for: 'pa_huashan'
** Do you have the right repo manifest?
i'll upload my "pa_huashan.mk" file: https://mega.co.nz/#!gZESjTKQ!ESlhCwWQROoh53SFYJ5vqyA177o5jqZdy9V688BWUNs
EDIT: I modified my huashan.adds file
EDIT2: I really needs some help with this! I'm familiar with the compiling process of cyanogenmod but this is a whole new story
Click to expand...
Click to collapse
Just need to update/add pa_huashan to the pa vendor makefiles.
@kamarush
Remember you in developing the Xperia line 2011. Glad to see it with our Xperia SP. Some project in mind?
[QOUTE]Yeah was long time ago i just bought this device a week ago. I just came back to Sony from Samsung [/QUOTE]
Great, i really want rom by you. i hope you can make it soon..:good:
OK guys the build has started again! All my previous problems were caused by syncing the old repo (github.com/paranoidandroid) instead of the new one (github.com/AOSPA-legacy) if you get errors like I did try and use the new source (repo init -u git://github.com/AOSPA-legacy/manifest.git -b kitkat)
Just letting you guys know that this project isn't dead
noahvt said:
OK guys the build has started again! All my previous problems were caused by syncing the old repo (github.com/paranoidandroid) instead of the new one (github.com/AOSPA-legacy) if you get errors like I did try and use the new source (repo init -u git://github.com/AOSPA-legacy/manifest.git -b kitkat)
Just letting you guys know that this project isn't dead
Click to expand...
Click to collapse
When you port AOSPA to unlocked Bl's, could you make a version for locked BL's?
MrSteve555 said:
When you port AOSPA to unlocked Bl's, could you make a version for locked BL's?
Click to expand...
Click to collapse
I'm already using the locked bootloader vendor blobs
Sent from my C5303 using XDA Free mobile app
noahvt said:
I'm already using the locked bootloader vendor blobs
Sent from my C5303 using XDA Free mobile app
Click to expand...
Click to collapse
That's really good. :thumbsup: One last question, why aren't you porting the latest PA(4+)?
MrSteve555 said:
That's really good. :thumbsup: One last question, why aren't you porting the latest PA(4+)?
Click to expand...
Click to collapse
I am now! I forgot to tell you that the version updated this ROM will now be 4.4.2 kitkat!
@kamarush still getting product name not defined but build started! I'll finish it tomorrow
Sent from my C5303 using XDA Free mobile app
noahvt said:
I am now! I forgot to tell you that the version updated this ROM will now be 4.4.2 kitkat!
@kamarush still getting product name not defined but build started! I'll finish it tomorrow
Sent from my C5303 using XDA Free mobile app
Click to expand...
Click to collapse
It's really good! If you finish the build tomorrow, I'll flash it right away . I loved PA on my N7, and I think it's the one of the best ROM's on xda. Hopefully PA won't have that annoying freeze bug.
MrSteve555 said:
It's really good! If you finish the build tomorrow, I'll flash it right away . I loved PA on my N7, and I think it's the one of the best ROM's on xda. Hopefully PA won't have that annoying freeze bug.
Click to expand...
Click to collapse
Unfortunately it probably will have the freeze bug as it's based on the vendor blobs that bagyusz uses
Sent from my C5303 using XDA Free mobile app
Hi folks,
I just started to port UbuntuTouch for the Sony Xperia Z Ultra and I think I should have a *.zip ready for testing in 2 weeks.
Until then, I will use this thread as a scrap book to document all the troubles I run into, all the things that needed my special attention and fixes that are not that obvious. I hope there will be some fellas brave enough to test everything and report back or even to join me with the development.
Best regards,
Kalle
First Update:
I found that the Ubuntu Touch version that ist based on CyanogenMod was not updated to a more recent version. This means that I have to either look into AOSP or backport everything to CM-10.1. I think backporting is kinda stupid because newer we are writing new software to improve things. Sadly I don't have much experiance with AOSP so I will have to find out how everything works and what the differences to CyanogenMod are.
The good news is, that I'm catching up with the mailing list, which means I'll have a place to call for help.
Also I'm in the progress to start a git repo, but I'm unsure what I will need to add, maybe some common stuff from sony does not need to be changed.
So long,
Kalle
Update!
There is a new porting guide! See here
I already freed some space for it and ordered a bit more ram so after my exam next week, I'll pick this up/Start all over.
Hope you are as excited as I am,
Kalle
XDA:DevDB Information
Ubuntu Touch for Sony Xperia Z Ultra, ROM for the Sony Xperia Z Ultra
Contributors
KalleEatingBrain, Kohelet
ROM OS Version: 4.4.x KitKat
ROM Kernel: Linux 3.4.x
ROM Firmware Required: Unlocked Bootloader
Based On: AOSP
Version Information
Status: Testing
Created 2014-05-14
Last Updated 2015-02-24
freaking awesome!
freaking awesome!
i would like to test. maybe i can help with developing/porting
Thank you for your efforts. I will test if needed.
Sent from my C6806 using XDA Premium 4 mobile app
Great this would be awesome if you can make it happen. I'm here for testing if required.
Sent from my C6833 using XDA Premium 4 mobile app
In also here for testing... Ubuntu Touch has intruiged me, I would love to try it out.
Thx... (thread bookmarked)
Sent from my C6833 using Tapatalk
I keep meaning to reply to this thread... Thanks for putting the effort in to get this working. If you want any hints/tips etc from my experience in getting slim and carbon built for the ZU just ask, I'll be willing to test aswell
iBuzman said:
Thx... (thread bookmarked)
Sent from my C6833 using Tapatalk
Click to expand...
Click to collapse
+1
Nice.ill be watching out everyday
Sent from my C6833 using XDA Premium 4 mobile app
blueether said:
I keep meaning to reply to this thread... Thanks for putting the effort in to get this working. If you want any hints/tips etc from my experience in getting slim and carbon built for the ZU just ask, I'll be willing to test aswell
Click to expand...
Click to collapse
Cool, thanks can you give me a hint on how to deal with new targets in Aosp? I mean setting up the files in a way "lunch" is able to find the right target.
Sent from my C6833 using XDA Free mobile app
vendersetup.sh file in vender/ might be what you are looking for?
have a gander at this http://www.kandroid.org/online-pdk/guide/build_new_device.html
How are you doing on this? I've just started working on this as well and am curious to know how far along you've gotten/what issues you've run into.
Sent from my Nexus 7 using XDA Free mobile app
So I've gotten the build to start, but I'm running into issues with libhybris:
ubuntu/hybris/compat/media/media_codec_layer.cpp:51:40: fatal error: gui/IGraphicBufferProducer.h: No such file or directory
compilation terminated.
make: *** [out/target/product/togari/obj/SHARED_LIBRARIES/libmedia_compat_layer_intermediates/media_codec_layer.o] Error
I'll post here once I've found a solution.
Kohelet said:
So I've gotten the build to start, but I'm running into issues with libhybris:
ubuntu/hybris/compat/media/media_codec_layer.cpp:51:40: fatal error: gui/IGraphicBufferProducer.h: No such file or directory
compilation terminated.
make: *** [out/target/product/togari/obj/SHARED_LIBRARIES/libmedia_compat_layer_intermediates/media_codec_layer.o] Error
I'll post here once I've found a solution.
Click to expand...
Click to collapse
Yeah, thats as far as I got, too. :-/ I tried removing all different libs or compiling different parts and leaving others out but I couldn't get any futher. Also I saw your post to the mailing list but it seems like you wont get a helpful reply either. As far a I could track this problem is the incompatibility of togari CM-11 and the ubuntu AOSP source tree. On xda-university there is a guide for porting from CM to AOSP which I will try but maybe you should take a look, too. Anyways: Great to see there is someone else except lazy me working on this.
Best regards,
Kalle
KalleEatingBrain said:
Yeah, thats as far as I got, too. :-/ I tried removing all different libs or compiling different parts and leaving others out but I couldn't get any futher. Also I saw your post to the mailing list but it seems like you wont get a helpful reply either. As far a I could track this problem is the incompatibility of togari CM-11 and the ubuntu AOSP source tree. On xda-university there is a guide for porting from CM to AOSP which I will try but maybe you should take a look, too. Anyways: Great to see there is someone else except lazy me working on this.
Best regards,
Kalle
Click to expand...
Click to collapse
I actually got past the libhybris issue. The problem was that the porting guide is out of date. It's based on using cm-10.1 whereas the current source for Ubuntu is based on cm-11.0. So if you use 4.4.2 instead instead of 4.2.2 then it works. But there are so many other issues and the documentation for fixing them is so poor. I've kept a running list of problems I've come across and the solutions for them (it's below).
Also they dropped the whole UCM thing so you should be able to get sound working once you actually get a working build, but I couldn't get it to build. The error that is currently in my way has to do with "No rule to make target signapk.jar needed by com.qualcomm.location" or something or other. And I found nothing on how to solve that online.
At this point I've decided to take a short break from the whole thing because it's so frustrating.
Once I get motivated to work on it again, I'll probably start from scratch.
Issues List (I apologize for not being specific about the errors, I didn't write them down verbatim):
If you get an error about libelf you need to add CyanogenMod/android_external_elfutils to your local_manifests/roomservice.xml and also add external/elfutils under subdirs in build/core/main.mk
Don't forget to also add device/sony and vendor/sony to build/core/main.mk as well.
The build will complain about not having a rule to make android-boot.img. To fix you have to go to device/sony/fusion3-common/custombookimg.mk and change boot.img to android-boot.img. You need to make the same change in device/sony/rhine-common/custombootimg.mk
I got an error about android.hardware.bluetooth_le.xml. If you just restart the build it doesn't complain, but I didn't find a proper solution to that.
If you get the libhybris error you have the wrong version of the Ubuntu source. Make sure you're using 4.4.2 when you phablet-dev-botstrap. It should be phablet-dev-bootstrap --sources aosp --repo-branch phablet-4.4.2_r1 [target_directory]
You might get an error about a product_config.mk and how it's missing a makefile for togari. You have to make sure that in device/sony/togari Android.mk, cm.mk, full_togari.mk, and vendorsetup.sh PRODUCT_NAME is the same. I solved this by changing PRODUCT_NAME to cm_togari in all of them and then renamed full_togari.mk to cm_togari.mk
You might get an error like MODULE.TARGET.SHARED_LIBRARIES.libOmxCore already defined in hardware/qcom/media. You should have CyanogenMod/android_hardware_qcom_media-caf-new in your repo manifest with a path of android/qcom/media-caf-new so you can safely rm -rf the hardware/qcom/media directory to get past this error.
If you get an error about dtbToolCM, add /device/qcom/common/dtbtool to your subdirs in build/core/main.mk
You may get an error about mkbootimg, that's because Sony uses a different version of mkbootimg. The only option I found was to download it from the internet (Thanks DooMLorD!). Once you get that version edit device/sony/rhine-common/custombootimg.mk and replace $(MKBOOTIMG) with the path to your downloaded mkbootimg binary.
You might get an error about no rule to make target something/something/signapk.jar needed by something/something/com.qualcomm.location. I didn't find a solution to this error.
Click to expand...
Click to collapse
Thanks for that list, it's sure to help some one. I think I have had most of those errors in trying to get aosp to build.
Can I copy those errors to my [DEV]Random thoughts thread?
blueether said:
Thanks for that list, it's sure to help some one. I think I have had most of those errors in trying to get aosp to build.
Can I copy those errors to my [DEV]Random thoughts thread?
Click to expand...
Click to collapse
Sure, feel free. I built CM for all my devices and regretted not keeping such a list when I did that. So now every time I work on a build I keep lists like that. Eventually, when I have a working build, I'll post a guide for how to build following the same steps I took.
Kohelet said:
Sure, feel free. I built CM for all my devices and regretted not keeping such a list when I did that. So now every time I work on a build I keep lists like that. Eventually, when I have a working build, I'll post a guide for how to build following the same steps I took.
Click to expand...
Click to collapse
Yeh carbon and slim were easy to build, and simple fixes. AOSP on the other hand I wish I had kept a build log
Ah nice, when I last checked CM-11.0 was not working with the 4.4.2r2 branch. I think I know how to fix the problem with the *.apk. Basically you have to remove all java dependencies from all the makefiles. I will look it up, so I can tell you what to grep for. Do you have a git repo we can work on, or should I add you to mine (which is just a fork of the CM-repos)? I will take a look at the sound in the next days. Thanks for you list!
Keep it up,
Kalle
Sent from my C6833 using XDA Free mobile app
KalleEatingBrain said:
Ah nice, when I last checked CM-11.0 was not working with the 4.4.2r2 branch.
Click to expand...
Click to collapse
That could potentially be a major source of my problems. i wasn't aware of that.
I think I know how to fix the problem with the *.apk. Basically you have to remove all java dependencies from all the makefiles. I will look it up, so I can tell you what to grep for. Do you have a git repo we can work on, or should I add you to mine (which is just a fork of the CM-repos)? I will take a look at the sound in the next days. Thanks for you list!
Keep it up,
Kalle
Sent from my C6833 using XDA Free mobile app
Click to expand...
Click to collapse
All I have at the moment is a fork of the CM repos. Feel free to add me to your repo. My username on Github is Kohelet as well. I can start to look into removing java dependencies as well.
As for the sound, the mailing list made it appear as if it was a simple matter of running
Code:
$ sudo apt-add-repository ppa:ci-train-ppa-service/landing-018
$ sudo apt-get update
$ sudo apt-get dist-upgrade
$ sudo apt-get install pulseaudio-module-droid
I could be wrong though.
I have a repo with android cm-12.1 as branch.
Now i want to update this repo to new CM version 13.0 without downloading the whole repo again.
Is that possible?
Unfortunately, no. Too many differences in the code bases.
MJPollard said:
Unfortunately, no. Too many differences in the code bases.
Click to expand...
Click to collapse
Okay,what happens if init a new branch (cm-13.0) in the same repo directory.
Is it faster than new repo?
Sent from my Micromax bolt
A27 using XDA Free mobile app
svprm said:
Okay,what happens if init a new branch (cm-13.0) in the same repo directory.
Is it faster than new repo?
Click to expand...
Click to collapse
Even if you could do that (and I'm not sure you can), the new branch would probably have to sync every single package over again, so you aren't really saving any time (and would likely cause major headaches). I think you really would be better off creating a completely new repo.
I have a kernel that I need to merge MM-mr2 in. So I have my kernel and MM-mr2 in my github. I just need to merge mr2 into my base. I have googled my a** of and havent had any luck. Someone who could help with the commands it would be greatly appreciated
Not sure I am tracking completely. I'll do what I can to answer your query.
From what you are describing, you have 2 branches, Master and MM-mr2 for your kernel. Refer to Basic Branching and Merging and more Visual explanation here.
The critical thing to know is that, both should be your branches. If one of them is owned by someone else, then you will be required to create a Pull Request.
Basically here are the steps you'd follow.
Checkout your master Branch where your other branch is going to be merged.
I assume MM-MR2 is another branch in the same repository Tree. If so, just issue ,
Code:
git merge MM-mr2
Now issue git status command to see the merge resulted in conflicts. It most likely will depending on what MR2 had that master did not.
Resolve the conflicts, then issue,
git add -A
this will add all the modified files to your commit. At which time you can do
git commit --amend
which will create a new commit on the master branch. This you can push to your git.
Oh and FYI, this thread is a good resource to me. [Guide] How to use Github
Perseus said:
Not sure I am tracking completely. I'll do what I can to answer your query.
From what you are describing, you have 2 branches, Master and MM-mr2 for your kernel. Refer to Basic Branching and Merging and more Visual explanation here.
The critical thing to know is that, both should be your branches. If one of them is owned by someone else, then you will be required to create a Pull Request.
Basically here are the steps you'd follow.
Checkout your master Branch where your other branch is going to be merged.
I assume MM-MR2 is another branch in the same repository Tree. If so, just issue ,
Code:
git merge MM-mr2
Now issue git status command to see the merge resulted in conflicts. It most likely will depending on what MR2 had that master did not.
Resolve the conflicts, then issue,
git add -A
this will add all the modified files to your commit. At which time you can do
git commit --amend
which will create a new commit on the master branch. This you can push to your git.
Oh and FYI, this thread is a good resource to me. [Guide] How to use Github
Click to expand...
Click to collapse
Heres my github https://github.com/APOPHIS9283
I need to merge shamu-mr2, into Project-Rachel
apophis9283 said:
Heres my github https://github.com/APOPHIS9283
I need to merge shamu-mr2, into Project-Rachel
Click to expand...
Click to collapse
Merging two repos is a immense undertaking. Not that it can not be done. But it means enormous amount of work. It is not the same as merging two branches, as I assumed earlier.
Would you care to explain why those two repos need to be merged? Is there a set of commits from one that you'd like in the other ?
Yeah my kernel is pretty much marshmallow. I need to bring in marshmallow mr2 to have it up to date with Google
*BUMP*
Anyone?
apophis9283 said:
Yeah my kernel is pretty much marshmallow. I need to bring in marshmallow mr2 to have it up to date with Google
Click to expand...
Click to collapse
In that case, do a Diff on github.com and choose those two to compare. That will create a Pull Request that you can merge. Please see this Tut.
Perseus said:
In that case, do a Diff on github.com and choose those two to compare. That will create a Pull Request that you can merge. Please see this Tut.
Click to expand...
Click to collapse
One last question. Sorry Github and such has always beena weak point.
https://android.googlesource.com/kernel/msm/+/android-msm-shamu-3.10-marshmallow-mr2/
I try to fork that but there doesnt seem to be a way
apophis9283 said:
Yeah my kernel is pretty much marshmallow. I need to bring in marshmallow mr2 to have it up to date with Google
Click to expand...
Click to collapse
apophis9283 said:
One last question. Sorry Github and such has always beena weak point.
https://android.googlesource.com/kernel/msm/+/android-msm-shamu-3.10-marshmallow-mr2/
I try to fork that but there doesnt seem to be a way
Click to expand...
Click to collapse
Trust me when I say, I HATE Git for the obnoxious, inane and downright silly errors it throws at me. You're not the first and most definitely not the last.
As to that link, unfortunately you will need to download a archive (See that .tgz link up top ? ). Expand the contents locally, then create a dummy repo in your own Git via web. Then Push the local unzipped folder to that Repo. The end result on Github should look exactly like what is at that link. Here's a Link that might help.
Perseus said:
Trust me when I say, I HATE Git for the obnoxious, inane and downright silly errors it throws at me. You're not the first and most definitely not the last.
As to that link, unfortunately you will need to download a archive (See that .tgz link up top ? ). Expand the contents locally, then create a dummy repo in your own Git via web. Then Push the local unzipped folder to that Repo. The end result on Github should look exactly like what is at that link.
Click to expand...
Click to collapse
I created a dummy github account and forked mr2. No matter what I do I cant even see mr2 as an option. This has been so frustrating I just dont have the patience to deal with it anymore. I truly appreciate your time
Thanks to xanax droid. I literally had to type in 4 commands and bam. I was fone that quick