I agee to that. As we have to use the 0_97 branch anyway (and we do), why not skip the MSNP15-related commits... That means less work and a better bugfix release!
Anyway, everyone should take care to have real descriptive commit messages, it will be easier then to select which commits should be merged into the 0_97 branch. Harry Op 12-jan-2008, om 23:25 heeft Philippe Valembois - Phil het volgende geschreven: > The branch is here > We only have to merge changes applied to the trunk to it.... > In fact I hope we will do 0.97.1 without any P15 code ! > Phil > > Youness Alaoui a écrit : >> Can be done, but we can also do it later... >> basically, why later.. only because the more I wait, the more >> chance someone else will do this boring task... lol >> no seriously, the reason is because if we have two branches now, >> we'll have to commit in both branches, which is difficult/ >> complicated/blabla (and >> more of a PITA than difficult).. but in the end, before we >> release, we will still need to check every commit to make sure >> that we didn't forget any >> bugfix, then apply them on the branch (like we did for previous >> versions but skipped it for 0.97 since we had no new feature and >> it was a pain to do). >> so why waste time now, do the branch thing, then spend months >> developping and double-commiting, and in the end, review each >> commit and apply missing >> commits to the branch, while we could just develop normal, and in >> the end, review each commit and apply bugfix commits to the branch ? >> that was my idea, I could be wrong, in the end, do whatever you >> think is best. >> >> KaKaRoTo >> >> On Sat, Jan 12, 2008 at 08:32:46PM +0000, Tom Hennigan wrote: >>> Why not branch now? Then new features can go to trunk, bug fixes >>> go on >>> the 0.97.1 branch? >>> >>> On 12 Jan 2008, at 20:26, Youness Alaoui wrote: >>> >>>> I don't agree!!!! >>>> well.. I don't like the idea because we want to have a bugfix >>>> release, and I don't want new features in... >>>> The MSNP15 was ok because everything was inside an 'if >>>> [config::getKey protocol] == 15' so it wouldn't affect anything >>>> else. >>>> But now, you're already working on it, and scapor is also doing >>>> some >>>> new stuff, so we're starting to get some improvements, and maybe >>>> that's all >>>> because we just released, we're not in a feature freeze, so >>>> everyone >>>> is happy and active... and I'm happy to see amsn-commits mailing >>>> list flooding my >>>> inbox, so I don't want to stop anyone from doing what they think >>>> should be done... >>>> Once we do the bugfix release, we might just apply patches one >>>> after >>>> the other into the 0_97 branch or something like that and release >>>> the version >>>> without any of the new 'unstable' functionality and leave the new >>>> features for 0.98. >>>> >>>> KaKaRoTo >>>> >>>> On Sat, Jan 12, 2008 at 09:20:47AM +0000, square87 wrote: >>>>> Hi all :) >>>>> >>>>> I just want to say that i'll start to work on "notification >>>>> window" >>>>> to allow >>>>> smileys and colored text in it. Just i did with topCW. >>>>> If you are not agree or whatever: say it :P >>>>> >>>>> I'll update this post. >>>>> >>>>> Bye. >>>>> Square87 >>>>> ------------------------------------------------------------------ >>>>> ------- >>>>> Check out the new SourceForge.net Marketplace. >>>>> It's the best place to buy or sell services for >>>>> just about anything Open Source. >>>>> http://ad.doubleclick.net/clk;164216239;13503038;w?http:// >>>>> sf.net/marketplace >>>>> _______________________________________________ >>>>> Amsn-devel mailing list >>>>> Amsn-devel@lists.sourceforge.net >>>>> https://lists.sourceforge.net/lists/listinfo/amsn-devel >>>> >>>> ------------------------------------------------------------------- >>>> ------ >>>> Check out the new SourceForge.net Marketplace. >>>> It's the best place to buy or sell services for >>>> just about anything Open Source. >>>> http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/ >>>> marketplace >>>> _______________________________________________ >>>> Amsn-devel mailing list >>>> Amsn-devel@lists.sourceforge.net >>>> https://lists.sourceforge.net/lists/listinfo/amsn-devel >>> >>> -------------------------------------------------------------------- >>> ----- >>> Check out the new SourceForge.net Marketplace. >>> It's the best place to buy or sell services for >>> just about anything Open Source. >>> http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/ >>> marketplace >>> _______________________________________________ >>> Amsn-devel mailing list >>> Amsn-devel@lists.sourceforge.net >>> https://lists.sourceforge.net/lists/listinfo/amsn-devel >> >> --------------------------------------------------------------------- >> ---- >> Check out the new SourceForge.net Marketplace. >> It's the best place to buy or sell services for >> just about anything Open Source. >> http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/ >> marketplace >> _______________________________________________ >> Amsn-devel mailing list >> Amsn-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/amsn-devel >> >> > > > ---------------------------------------------------------------------- > --- > Check out the new SourceForge.net Marketplace. > It's the best place to buy or sell services for > just about anything Open Source. > http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/ > marketplace > _______________________________________________ > Amsn-devel mailing list > Amsn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/amsn-devel ------------------------------------------------------------------------- Check out the new SourceForge.net Marketplace. It's the best place to buy or sell services for just about anything Open Source. http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace _______________________________________________ Amsn-devel mailing list Amsn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amsn-devel
