Am Samstag, 23. Juli 2011, 21:23:16 schrieb Martin Hejl: > Hi kp, > > which branch did you commit it to? That was the main reason I didn't > commit it myself - the change seemed harmless enough, but I didn't > really know where to commit it - the maintenance branch for 4.0 or > directly to HEAD, or to both (and if the latter, how would one do that?). > > Short version is, I'm still confused about operating this git thing :-) > Hi Martin;
I committed to master (which referred to as "HEAD" and which is the default if you just checkout the git repository). If unshure you can always commit to master and someone else can commit it to the maintenance branch later. I agree that the patch also qualifies to be applied to the maintenance branch (4.0-fixes), but I didn't because I'm not shure if we will have enough changes to make a 4.0.2 version before we start with 4.1. It's a bit more work to commit two both branches (you baiscally have to do the work twice), but for a start please read: https://sourceforge.net/apps/mediawiki/leaf/index.php?title=Bering- uClibc_4.x_-_Developer_Guide_- _Hints_and_Tips_for_using_Git_SCM#Remote_Branches esp. the paragraph about "Tracking a remote branch" and https://sourceforge.net/apps/mediawiki/leaf/index.php?title=Bering- uClibc_4.x_-_Developer_Guide_- _Hints_and_Tips_for_using_Git_SCM#Working_with_a_new_Branch how to switch between branches and how to work with. I hope the documentation is clear and easy enough to get the basics. kp > > Am 23.07.2011 20:21, schrieb KP Kirchdoerfer: > > Am Samstag, 23. Juli 2011, 19:53:17 schrieb Martin Hejl: > >> Hi everybody, > >> > >> it appears that the busybox version of inetd doesn't create a pidfile, > >> hence "svi inetd stop" doesn't work (and "svi inted start" doesn't > >> notice it's already running). > >> > >> The attached patch seems to fix the issue for me > >> > >> Martin > > > > thx Martin, > > > > commited to git > > > > kp > > ------------------------------------------------------------------------- > > ----- Storage Efficiency Calculator > > This modeling tool is based on patent-pending intellectual property that > > has been used successfully in hundreds of IBM storage optimization > > engage- ments, worldwide. Store less, Store more with what you own, > > Move data to the right place. Try It Now! > > http://www.accelacomm.com/jaw/sfnl/114/51427378/ > > > > _______________________________________________ > > leaf-devel mailing list > > leaf-devel@lists.sourceforge.net > > https://lists.sourceforge.net/lists/listinfo/leaf-devel ------------------------------------------------------------------------------ Storage Efficiency Calculator This modeling tool is based on patent-pending intellectual property that has been used successfully in hundreds of IBM storage optimization engage- ments, worldwide. Store less, Store more with what you own, Move data to the right place. Try It Now! http://www.accelacomm.com/jaw/sfnl/114/51427378/ _______________________________________________ leaf-devel mailing list leaf-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/leaf-devel
