Hi KP
at 27.06.2011 19:20, KP Kirchdoerfer wrote:
> Am Sonntag, 26. Juni 2011, 22:27:13 schrieb Andrew:
>> 26.06.2011 22:59, KP Kirchdoerfer пишет:
>>> configure:12114: /lib/cpp -DNO_ASM conftest.cpp
>>> /usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5.2/cc1plus: error while
>>> loading shared libra
Am Sonntag, 26. Juni 2011, 22:27:13 schrieb Andrew:
> 26.06.2011 22:59, KP Kirchdoerfer пишет:
> > configure:12114: /lib/cpp -DNO_ASM conftest.cpp
> > /usr/lib/i386-linux-gnu/gcc/i686-linux-gnu/4.5.2/cc1plus: error while
> > loading shared libraries: libc.so.0: cannot open shared object file: No
>
Andrew
at 27.06.2011 13:27, Andrew wrote:
> 27.06.2011 14:20, Erich Titl пишет:
..
> Yes. If fixes are placed in 4.0-fixes, rebasing master from 4.0 tag to
> latest commit in 4.0-fixes should add all fixes into master (and other
> branches that are splitted from master later than 4.0 tagged com
27.06.2011 14:20, Erich Titl пишет:
> Hi Andrew
>
> at 27.06.2011 11:14, Andrew wrote:
> ...
>> There is no difference metween 'master' branch and any other - so if
>> some branch can be rebased to different commit of master, also master
>> can be rebased to different commit of some branch :)
> So
Hi Andrew
at 27.06.2011 11:14, Andrew wrote:
...
>>
> There is no difference metween 'master' branch and any other - so if
> some branch can be rebased to different commit of master, also master
> can be rebased to different commit of some branch :)
So your solution would be to rebase master to
27.06.2011 12:06, Erich Titl пишет:
> Andrew
>
> at 27.06.2011 10:33, Andrew wrote:
> ...
>> Yes, patches from commits now are applied mostly manually - due to
>> different dir structure. But possible 'git rebase' on stable branch
>> should be successful - so if changes are placed in stable bugfix
Andrew
at 27.06.2011 10:33, Andrew wrote:
...
>>
> Yes, patches from commits now are applied mostly manually - due to
> different dir structure. But possible 'git rebase' on stable branch
> should be successful - so if changes are placed in stable bugfix branch,
> master branch (and other branc
27.06.2011 00:51, Erich Titl пишет:
> Andrew
>
> on 26.06.2011 23:39, Andrew wrote:
>> 27.06.2011 00:18, Erich Titl пишет:
>>> Hi KP
>>>
>>> on 25.06.2011 20:10, KP Kirchdoerfer wrote:
Hi David;
>>> ...
Correct, so git cherry-pick might be a solution for small changes.
I've read
