Re: Merging O+ into 5.5

Hi, For now, I'm trying subtree merging (See http://git-scm.com/book/ch6-7.htmland https://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html ) You may see the result at https://github.com/dstogov/php-src/tree/PHP-5.5/ This is not an ideal solution: - "git log" doesn't show full history on O+ files (however it's stored in GIT) - merging from PHP to existing O+ git repo (for pecl release) is not trivial. Anyway I'm going to merge O+ into PHP-5.5 today. Thanks. Dmitry. On Fri, Mar 15, 2013 at 8:09 AM, Xinchen Hui <laruence@gmail.com> wrote: > Hey: > sorry for later reponse, I am kindof busy these days. > > about this, I think David may give us a good hint. > > David: > could you introduce us some tools/inf about to how to doing this? > > of course I can do this at weekend :) > > thanks > > On Thu, Mar 14, 2013 at 8:43 PM, Dmitry Stogov <dmitry@zend.com> wrote: > > Hi Laruence, > > > > What do you think is the best way of merging O+ into PHP-5.5? > > It would be great to keep the commits history and allow easy merging > between > > PHP and existing O+ repositories. > > > > Thanks. Dmitry. > > > > > > -- > 惠新宸 laruence > Senior PHP Engineer > http://www.laruence.com >