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: | Rasmus Lerdorf | Date: | Tue, 28 Jul 2009 08:51:08 +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 6 | Groups: | php.internals |
| Request: | Send a blank email to internals+get-45116@lists.php.net to get a copy of this message | ||
Moriyoshi Koizumi wrote:
> 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.
I don't think a merge will work the way we use branches though. Once
you merge you aren't supposed to keep making changes on the branch.
merge is good for when you create a branch to work on some larger
feature and when it is ready you merge it into trunk and continue
working on it in trunk.
-Rasmus