Am Samstag, 25. Juni 2011, 12:39:47 schrieb davidMbrooke: > On Sat, 2011-06-25 at 12:23 +0200, Erich Titl wrote: > > Hi KP > > > > on 24.06.2011 20:31, KP Kirchdoerfer wrote: > > > Hi; > > > > > > just created the remote branch 4.0.1 > > > > > > This branch is intended to work fixes for 4.0.1. > > > I've currently only > > > > > > - updated webconf to fix Trac tickets #50, #51 and #52 > > > > What are those, I am (trying) working on webconf as soon as all this > > confusion with the repository is over. > > Hi Erich, > See https://sourceforge.net/apps/trac/leaf/report/6 for details of all > the Trac tickets. > > > > - fixed bug in hash shaper (crash on initialization more than 9 > > > networks up to > > > > > > /24 width) > > > and removed /bin directory. > > > > > > Feel free to add some bugfixes for 4.0.1 as well :) > > > > > > Note: It has still the old layout (bering-uclibc4). > > > > This is confusing, could we stick to one single layout? > > Not really. The 4.0.1 branch is a snapshot of how the Git repository > looked when 4.0 was released, and at that time we had the old directory > structure. > > > > http://sourceforge.net/apps/mediawiki/leaf/index.php?title=Bering-uClib > > > c_4.x_- > > > _Developer_Guide_-_Hints_and_Tips_for_using_Git_SCM#Remote_Branches > > > > I am not sure we want to work on many different branches, unless one > > goes in a completely different direction. Working on many branches just > > generates (at least at my end) confusion about the merging process and > > my recent experience has not made me really confident. > > > > So apparently there is more than one layout, which one is the one we > > should stick to? > > Which branch should be the one to work on? > > The "master" branch in the leaf/bering-uclibc repository should be used > for all new work. This will be released as 4.1-beta1 and then 4.1, and > then 4.2 etc. > Only if you are *specifically* fixing a *minor* bug in 4.0 which needs > to be released in 4.0.1 should you work on the 4.0.1 branch. > > > cheers > > > > Erich > > You can probably just ignore the new branch. It is mostly for kp and me > to use to check we understand how branches (especially remote branches) > work.
Yes, and I will even change it to 4.0-fixes today, as David proposed. Anyway I'd like test a bit further, so if David can just a a change, so that I can see what happens.... I will update the wiki once we have a stable layout. 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
