Thanks harry, you just took that out of my mouth :) merging will be useless if the diffs are in gui.tcl and the same code was moved to contact.tcl for example...
KKRT On Sat, 27 May 2006 07:22:56 -0400, Harry Vennik <[EMAIL PROTECTED]> wrote: > I am reviewing everything regularly, and it appears Youness does too, so > I > think we're safe! Merging at the end may not be right, because things may > grow apart while we are doing RC1, RC2 and maybe RC3, and the diff might > become too messy. Now we're still working on not much more than 0.96 > TODO, > many things go into both trunk and branches/0_96, but that will probably > change once RC1 is out. > > Also please don't be too quick in committing things to the 0_96 branche! > Things should go there only once they're reviewed, and that is (except > for > typo-fixes and small bugfixes) not just reviewing by the one who does the > commit on trunk. Also, be sure not to commit post-0.96 stuff there. > > Harry > > Op zaterdag 27 mei 2006 13:07, schreef Philippe Valembois - Phil: >> Hey, >> Will we merge branches when 0.96 will be out ? >> It should be the way to be sure to don't lost anything... >> Phil >> >> Le Saturday 27 May 2006 10:38, Youness Alaoui a écrit : >> > Hey, I've seen some commits go in the trunk without being ported to >> the >> > 0.96 branch and some to the 0.96 branch without being sent to the >> > trunk... Billiob, you did 2 commits >> > http://svn.sourceforge.net/viewcvs.cgi/amsn?rev=6714&view=rev and >> > http://svn.sourceforge.net/viewcvs.cgi/amsn?rev=6715&view=rev that did >> > not go in the trunk/ and they should or else we'll end up with missing >> > commits... >> > Do we have to keep monitoring the amsn-commits ML ? And I'm glad I >> look >> > at viewVC, or else I would have never seen billiob's mistake since >> they >> > were done when the mailing lists were bouncing off our mails... >> > Fred, you did the opposite, you put in the trunk, not in the 0.96 >> branch. >> > I just want everyone to remember how it works now, you should have 2 >> amsn >> > checkouts, any commits that go in the trunk/ should be reviewed, and >> if >> > they are good enough for us to go in the 0.96 branch, then it should >> go >> > there too, you repatch the 0.96 directory and commit it. If a commit >> goes >> > into the 0.96 branch, then automatically, you should put it in the >> trunk >> > too! >> >> _______________________________________________ >> Amsn-devel mailing list >> Amsn-devel@lists.sourceforge.net >> https://lists.sourceforge.net/lists/listinfo/amsn-devel > > > _______________________________________________ > Amsn-devel mailing list > Amsn-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/amsn-devel -- KaKaRoTo _______________________________________________ Amsn-devel mailing list Amsn-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/amsn-devel
