[pLog-svn] Merge plans for 1.0.2 to 1.1

[nick nizhenyuan]

I try to merge 1.0.2 and 1.0 by myself, it's a littile tiring but I
know plog better:)

On 8/12/05, Mark Wu <markplace at gmail.com> wrote:
> I think the merge process is getting urgent   .... The best time to merge
> the the 1.0.2 back to 1.1 should be after 1.0.2 release .
> 
> We have 3 development branches at this moment, and it really get things more
> complicated:
> 
> 1. 1.02 Development Branch - with a lot of bug fix and new features not in
> 1.1
> 2. 1.1-ben - with complete DB-cache implement to our pLog DAO and with a lot
> of features not in 1.0.2
> 3. 1.1-daochanges - with Oscar's enhencement of 1.1-ben
> 
> The problem of 2,3 is they don't have a bugs fix and new features in 1.0.2
> since last merge (3 months ago, I guess).
> 
> Maybe next time when we want to fork a development branch, we need to limit
> the scope of changes. For example, the 1.1-ben branch only limit to DB-Cache
> implementation. I think it should be easier to manage.
> 
> Mark
> 
> > -----Original Message-----
> > From: plog-svn-bounces at devel.plogworld.net
> > [mailto:plog-svn-bounces at devel.plogworld.net] On Behalf Of
> > Paul Westbrook
> > Sent: Friday, August 12, 2005 2:55 AM
> > To: plog-svn at devel.plogworld.net
> > Subject: Re: [pLog-svn] Merge plans for 1.0.2 to 1.1
> >
> > Hello,
> >     Either way sounds fine.  I agree with you about the
> > longer that we stay on 1.0.2, the quicker it will come out.
> > The only downside to this is that fixes will continue to be
> > made while we are on it.  What is the planned release date for 1.0.2?
> >
> > --Paul
> >
> >
> > On Aug 11, 2005, at 3:04 AM, Jon Daley wrote:
> >
> > > On Thu, 11 Aug 2005, Paul Westbrook wrote:
> > >
> > >>   What are the plans for merging the 1.0.2 tree to 1.1?
> > >>
> > >     I would imagine the current plan is to do like we did
> > for 1.0.1,
> > > that everything will get merged once 1.0.2 is out.  But, I
> > know what
> > > you mean, that it would be nice to check out 1.1, but you
> > don't want
> > > to "downgrade" all the features/bug fixes of 1.0.2.
> > >     It is definitely the wrong thing to migrate some of the changes
> > > from 1.0.2 to 1.1.  I imagine that makes it difficult to merge
> > > everything later.
> > >     I think if we kept track of the date/revision of the merge, we
> > > could merge over everything in 1.0.2 up to now to 1.1, and then get
> > > the rest of 1.0.2 when it is released.
> > >
> > >     I have thought that the longer I stay on 1.0.2, the
> > quicker it is
> > > likely for 1.0.2 to come out, since I will have extra motivation to
> > > get things done.
> > >
> > >
> > >> I would like to try out 1.1, I don't think that a lot of the bugs
> > >> that I have fixed in the 1.0.2 tree that fix PHP5 problems have
> > >> been merged there yet.
> > >>
> > >     Correct.
> > >
> > >
> > > **************************************************************
> > > *         Jon Daley         *   The sooner you fall behind,  *
> > > *                           *  the more time you'll have to  *
> > > * http://jon.limedaley.com/ *            catch up.           *
> > > **************************************************************
> > > _______________________________________________
> > > pLog-svn mailing list
> > > pLog-svn at devel.plogworld.net
> > > http://devel.plogworld.net/mailman/listinfo/plog-svn
> > >
> > >
> >
> > --
> > Paul Westbrook
> > paul at westbrooks.org
> > <http://www.westbrooks.org>
> >
> >
> >
> 
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.plogworld.net
> http://devel.plogworld.net/mailman/listinfo/plog-svn
>