I mean not "git subtree merge" but "git read-dir --prefix ...". Actually it imports all the history form O+ repo, but it's recorded with original patches (e.g. ZendAccelerator.h instead of moved ext/ZendOptimizerPlus/ZendAccelerator.h), so you can see it running "git log", but not "git log ext/ZendOptimizerPlus/ZendAccelerator.h".
Thanks. Dmitry. On Fri, Mar 15, 2013 at 1:16 PM, Patrick ALLAERT <patrickalla...@php.net>wrote: > 2013/3/15 Dmitry Stogov <dmi...@zend.com>: > > 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. > > Using "git subtree merge" you will definitely loose log, however, ZO+ > hasn't been pushed to github with its full history anyway, which is a > bit sad. > You should use a merge technique that relies on "git filter-branch" if > you want to keep the history. > > Patrick >
