Re: cvs: phd(MAIN) /themes/php chmsource.php
| From: | Hannes Magnusson | Date: | Fri, 26 Dec 2008 15:15:18 +0000 |
| Subject: | Re: cvs: phd(MAIN) /themes/php chmsource.php | ||
| References: | 1 2 3 4 5 6 7 8 9 10 | Groups: | php.doc |
| Request: | Send a blank email to phpdoc+get-969379889@lists.php.net to get a copy of this message | ||
On Fri, Dec 26, 2008 at 02:39, Gang Chen <eniac2008@gmail.com> wrote:
> Hello Hannes, Kalle,
>
> Should I do it as following?
>
> step 1. cvs login
> step 2. cvs checkout -r PHD_0_4 -d PHD_0_4 phd
> step 3. cvs update -j 1.10 -j 1.10 chmsource.php
> step 4. solves the conflicts in chmsource.php
>
> lines 2-6 of chmsource.php (the line number was manually added by me)
>
> 2: <<<<<<< chmsource.php
> 3: /* $Id: chmsource.php,v 1.4.2.5.2.6 2008/12/06 07:49:29 nilgun Exp $ */
> 4: =======
> 5: /* $Id: chmsource.php,v 1.11 2008/12/24 01:23:27 eniac2008 Exp $ */
> 6: >>>>>>> 1.11
>
> delete line 2, 4, 5, 6 from the source.
>
> step 5. cvs commit -m "Fixed Bug #46714 - change ereg_* to preg_*" chmsource.php
Yup. That is exactly the way I do it most of the time.
> Question: Does the "MFH:" prefix will be added by the CVS system
> automatically?
No. "Merge From Head" is manually added to the commit message.
Merry Christmas!
-Hannes