Am Samstag, 25. Juni 2011, 20:07:05 schrieb Andrew: > 25.06.2011 20:41, davidMbrooke пишет: > > On Sat, 2011-06-25 at 18:33 +0200, KP Kirchdoerfer wrote: > >> Hi David > >> > >> ok, done. 4.0.1 deleted, 4.0-fxies created. > >> Please adjust your local git. You may need to delete 4.0.1 locally and > >> add the tracking command for 4.0-fixes, don't know... Don't used any > >> magic tricks as Andrew can do :) > >> > >> kp > > > > Hi kp, > > > > Like you I am not sure of all the Git magic spells yet so I deleted > > everything, re-cloned the bering-uclibc repository and re-created my > > tracking branch. Looks fine. I am happy with the branch name now :-) > > 'git pull' was enough good in that case ;)
git still seems to be too cool for David and me :)) > > Where we are applying bug-fixes for 4.0.1 we also need to apply those to > > the master branch so that they are included in 4.1. Unless Git has some > > clever way to do that we presumably need to just make the edits > > separately in each branch. > > > > dMb > > http://gitready.com/intermediate/2009/03/04/pick-out-individual-commits.htm > l but maybe there is a simplier method. > This may cause some troubles due to directory structure differences. > Maybe we should make directory structure identical? I don't think that's necessary. 4.0 will be history some time this year, and from 4.1 on, we will have the improved repository layout. I backported two of your commits since 4.0 to 4.0.1, but I'm not shure about others. Can you pls have a look into the remaining commits you made, like "ata_legacy"..., if they can backported quickly and without breaking 4.0? I think about a 4.0.1 release as a bugfix release/refresh of 4.0 within two weeks. kp ------------------------------------------------------------------------------ All the data continuously generated in your IT infrastructure contains a definitive record of customers, application performance, security threats, fraudulent activity and more. Splunk takes this data and makes sense of it. Business sense. IT sense. Common sense.. http://p.sf.net/sfu/splunk-d2d-c1 _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
