Michael Gao <[EMAIL PROTECTED]> writes: > On Thu, 2008-03-20 at 16:26 -0700, Kevin Hilman wrote: >> > Neuros kernel tree can be accessed at, >> > git.neurostechnology.com/git/kernels >> > >> > or view it at, >> > http://git.neurostechnology.com >> >> A friendly suggestion, to make it easier for us to collaborate and >> share development. >> >> I'm not sure exactly how you created this git tree, but it wasn't via >> a normal clone process. It appears that you created a brand new git >> tree, and then copied the existing davinci git tree in as a new >> commit. This makes it kind of difficult to work with. > Anything that is easier to collaborate and share works here. :) > > That said, as a git beginner, indeed I created the brand new git tree > then copied stuff over. :-( > > Neuros developers (both internal and community ones) need to push > changes to a centrally managed place as soon as patches pass Neuros > review (it is an unfortunate fact that often we have no choice but allow > 'crappy' patches in in order to hit product release schedule), how > should we correct to achieve this as well as what you suggested below?
I recommend that you re-clone the DaVinci git (as I mention below), and create a branch where you do all your neuros development. Then, apply your Neuros patches in your current tree onto your branch. This keeps all your work in your own branch, and none of the commits on the DaVinci git tree will affect your branch. >> What would be better to do: >> >> - clone current DaVinci git >> - make a branch for your development at your preferred snapshot >> >> $ git branch neuros-dev pre-2.6.24-merge >> >> - checkout your branch, and add your patches ther >> >> $ git checkout neuros-dev >> >> The benefit of this is that if we both have the same tree as the >> starting point, I can use a remote tracking branch to track your tree >> and directly cherry-pick patches from your tree. > > Agreed, the question is can we directly push to this remote branch or > any other workaround? Using my example, your 'neuros-dev' banch (or whatever you choose to call it) will be available from your public git repo. Others can pull your branch and cherry-pick or rebase your patches. Kevin _______________________________________________ Davinci-linux-open-source mailing list [email protected] http://linux.davincidsp.com/mailman/listinfo/davinci-linux-open-source
