Re: MDB 2.0
| From: | Greg Beaver | Date: | Sun, 29 Jun 2003 16:33:51 +0000 |
| Subject: | Re: MDB 2.0 | ||
| References: | 1 2 | Groups: | php.pear.dev |
| Request: | Send a blank email to pear-dev+get-17838@lists.php.net to get a copy of this message | ||
Hi Lukas,
I would switch the order a bit.
1) create an MDB_1 branch
2) commit all the MDB_2 branch changes to head (manually, use 2 local working copies, head and MDB_2, and just merge them using any number of merge tools, then commit)
3) remove MDB_2
this way, you can compare the branch to make sure you didn't forget anything before you delete it.
Regards,
Greg
Lukas Smith wrote:
From: Jon Parise [mailto:jon@php.net] Sent: Saturday, June 28, 2003 9:28 PMIt 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.Yeah, I can easily redo the changes. However what happens to the MDB_2 branch? That needs to be removed!? So basically what I would like to happen is the following: 1) create an MDB_1 branch from head 2) remove the MDB_2 branch 3) start commiting the MDB 2.0 changes to head all but 2) I can do myself. Regards, Lukas