Re: cvs: phd(MAIN) /themes/php chmsource.php

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 Question: Does the "MFH:" prefix will be added by the CVS system automatically? Regards & Merry Christmas, Chen Gang 2008/12/26 Hannes Magnusson <hannes.magnusson@gmail.com>: > On Fri, Dec 26, 2008 at 00:19, Kalle Sommer Nielsen <kalle@php.net> wrote: >> 2008/12/26 Kalle Sommer Nielsen <kalle@php.net>: >>> 2008/12/25 Hannes Magnusson <hannes.magnusson@gmail.com>: >>>> I've never used TortoriseCVS, I think Kalle has. >>>> Kalle; could you write up a small "howto"? >>> >>> I added a list item to the TortoiseCVS howto for quick how to checkout >>> a specific branch. >> >> Whoops forgot the link: >> >> http://wiki.php.net/doc/scratchpad/howto#quick_guide_for_improving_the_existing_php_documentation >> > > > Could you write up few sentences about how to actually _merge_? > > Merging by first creating a patch from one branch and the applying it > to another, or by letting cvs merging specific revisions, doesn't > really matter. Just whichever is easier.. > > -Hannes > -- PHP Internals Study http://www.phpinternals.com