Re: Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt
| From: | Moriyoshi Koizumi | Date: | Tue, 28 Jul 2009 08:34:15 +0000 |
| Subject: | Re: Re: svn: /php/php-src/branches/PHP_5_3/ext/gd/ libgd/gdft.c tests/bug48555.phpt tests/bug48732.phpt tests/bug48801.phpt | ||
| References: | 1 2 3 4 5 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-45113@lists.php.net to get a copy of this message | ||
Incorporating the changes and merges across the branches into one
commit under a sparse-layouted local copy doesn't do the book-keeping
against svn:mergeinfo. That's why I suppose it is not a good idea.
Moriyoshi
On Tue, Jul 28, 2009 at 7:44 AM, Gwynne Raskind<gwynne@darkrainfall.org> wrote:
> On Jul 27, 2009, at 6:31 PM, Takeshi Abe wrote:
>>>
>>> Just to be sure, is there any consensus on this? I thought I should
>>> use svn merge.
>>
>> README.SVN-RULES says
>>
>> 1. All changes should first go to trunk and then get merged from trunk
>> (aka MFH'ed) to all other relevant branches.
>>
>> which I've been following so far.
>
> That document is outdated. It's now (strongly) preferred that you use one of
> the various methods for multi-branch commits available in SVN, using merge
> or a sparse checkout.
>
> -- Gwynne
>
>