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 ;) > 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.html but maybe there is a simplier method. This may cause some troubles due to directory structure differences. Maybe we should make directory structure identical?
------------------------------------------------------------------------------ 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
