Re: MDB 2.0

On Sat, Jun 28, 2003 at 11:25:36AM +0200, Lukas Smith wrote: > > > as some of you may have noticed I have started to commit to a new > branch > > > of MDB which will become MDB 2.0. > > > > From a CVS perspetive, I think it would have been better to create a > > MDB_1 branch (in which you would perform "stable" maintenance of the > > MDB 1.x code) and continue developing MDB 2.0 on the tip. > > > > It's going to be difficult to fold the revision history of your new > > MDB_2 branch back into the MDB mainline later on (witness the mess > > that is now php-src and Zend(Engine2)). > > That does indeed sound like a smarter idea. Is it possible to go back > and undo this? It doesn't look like you've done much work in the MDB_2 branch yet, so it's probably safe to just create a new MDB_1 branch off of HEAD and commit your MDB_2 file straight to HEAD. You could try merging the MDB_2 branch back into HEAD using cvs magic, too: http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_5.html#SEC60 > Should be make this a general recommendation to be put into the > developer section of the pear manual? Yes, I think it should be. I believe it was once part of Stig's informal "how to manage multiple PEAR release branches" essays, too, but I don't think it ever made it into any of the documentation. -- Jon Parise (jon@php.net) :: The PHP Project (http://www.php.net/)