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
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 it can lead to problems if one merges later, but
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 it can lead to problems if one merges later, but our intention is
>> not to merge 4.0-fixes with maste
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 it can lead to problems if one merges later, but our intention is
> not to merge 4.0-fixes with master.
What exactly is this branch for then, s
26.06.2011 01:27, KP Kirchdoerfer пишет:
> Am Samstag, 25. Juni 2011, 20:07:05 schrieb Andrew:
>> 25.06.2011 20:41, davidMbrooke пишет:
>>> On Sat, 2011-06-25 at 18:33 +0200, KP Kirchdoerfer wrote:
Hi David
ok, done. 4.0.1 deleted, 4.0-fxies created.
Please adjust your local git
Am Samstag, 25. Juni 2011, 20:07:05 schrieb Andrew:
> 25.06.2011 20:41, davidMbrooke пишет:
> > On Sat, 2011-06-25 at 18:33 +0200, KP Kirchdoerfer wrote:
> >> Hi David
> >>
> >> ok, done. 4.0.1 deleted, 4.0-fxies created.
> >> Please adjust your local git. You may need to delete 4.0.1 locally and
Hi David;
Am Samstag, 25. Juni 2011, 19:41:25 schrieb davidMbrooke:
> On Sat, 2011-06-25 at 18:33 +0200, KP Kirchdoerfer wrote:
> > Hi David
> >
> > ok, done. 4.0.1 deleted, 4.0-fxies created.
> > Please adjust your local git. You may need to delete 4.0.1 locally and
> > add the tracking command
25.06.2011 20:41, davidMbrooke пишет:
> On Sat, 2011-06-25 at 18:33 +0200, KP Kirchdoerfer wrote:
>> Hi David
>>
>> ok, done. 4.0.1 deleted, 4.0-fxies created.
>> Please adjust your local git. You may need to delete 4.0.1 locally and add
>> the
>> tracking command for 4.0-fixes, don't know... Don'
On Sat, 2011-06-25 at 18:33 +0200, KP Kirchdoerfer wrote:
>
> Hi David
>
> ok, done. 4.0.1 deleted, 4.0-fxies created.
> Please adjust your local git. You may need to delete 4.0.1 locally and add
> the
> tracking command for 4.0-fixes, don't know... Don't used any magic tricks as
> Andrew can
Am Samstag, 25. Juni 2011, 17:30:07 schrieb davidMbrooke:
> On Sat, 2011-06-25 at 17:15 +0200, KP Kirchdoerfer wrote:
> > HI David;
> >
> > Am Samstag, 25. Juni 2011, 14:32:38 schrieb davidMbrooke:
> > > On Sat, 2011-06-25 at 12:53 +0200, KP Kirchdoerfer wrote:
> > > > Anyway I'd like test a bit f
On Sat, 2011-06-25 at 17:15 +0200, KP Kirchdoerfer wrote:
> HI David;
>
> Am Samstag, 25. Juni 2011, 14:32:38 schrieb davidMbrooke:
> > On Sat, 2011-06-25 at 12:53 +0200, KP Kirchdoerfer wrote:
> > > Anyway I'd like test a bit further, so if David can just a a change, so
> > > that I can see what
HI David;
Am Samstag, 25. Juni 2011, 14:32:38 schrieb davidMbrooke:
> On Sat, 2011-06-25 at 12:53 +0200, KP Kirchdoerfer wrote:
> > Anyway I'd like test a bit further, so if David can just a a change, so
> > that I can see what happens
> >
> > I will update the wiki once we have a stable layo
On Sat, 2011-06-25 at 12:53 +0200, KP Kirchdoerfer wrote:
> Anyway I'd like test a bit further, so if David can just a a change, so that
> I
> can see what happens
>
> I will update the wiki once we have a stable layout.
>
> kp
Hi kp,
I have just pushed a commit to the 4.0.1 branch - a sm
Am Samstag, 25. Juni 2011, 12:39:47 schrieb davidMbrooke:
> On Sat, 2011-06-25 at 12:23 +0200, Erich Titl wrote:
> > Hi KP
> >
> > on 24.06.2011 20:31, KP Kirchdoerfer wrote:
> > > Hi;
> > >
> > > just created the remote branch 4.0.1
> > >
> > > This branch is intended to work fixes for 4.0.1.
>
Hi Erich;
Am Samstag, 25. Juni 2011, 12:23:53 schrieb Erich Titl:
> Hi KP
>
> on 24.06.2011 20:31, KP Kirchdoerfer wrote:
> > Hi;
> >
> > just created the remote branch 4.0.1
> >
> > This branch is intended to work fixes for 4.0.1.
> > I've currently only
> >
> > - updated webconf to fix Trac
Erich;
Am Samstag, 25. Juni 2011, 12:30:38 schrieb Erich Titl:
> Hi KP
>
> on 25.06.2011 10:25, davidMbrooke wrote:
> > On Fri, 2011-06-24 at 20:31 +0200, KP Kirchdoerfer wrote:
> >> Hi;
> >>
> >> just created the remote branch 4.0.1
>
> One more question, in the trac system I see tickets for 4
On Sat, 2011-06-25 at 12:23 +0200, Erich Titl wrote:
> Hi KP
>
> on 24.06.2011 20:31, KP Kirchdoerfer wrote:
> > Hi;
> >
> > just created the remote branch 4.0.1
> >
> > This branch is intended to work fixes for 4.0.1.
> > I've currently only
> > - updated webconf to fix Trac tickets #50, #51
Hi KP
on 25.06.2011 10:25, davidMbrooke wrote:
> On Fri, 2011-06-24 at 20:31 +0200, KP Kirchdoerfer wrote:
>> Hi;
>>
>> just created the remote branch 4.0.1
One more question, in the trac system I see tickets for 4.01 4.1 and
4.2. As noone talks about anything but 4.0x this is confusing.
What is
Hi KP
on 24.06.2011 20:31, KP Kirchdoerfer wrote:
> Hi;
>
> just created the remote branch 4.0.1
>
> This branch is intended to work fixes for 4.0.1.
> I've currently only
> - updated webconf to fix Trac tickets #50, #51 and #52
What are those, I am (trying) working on webconf as soon as all
On Fri, 2011-06-24 at 20:31 +0200, KP Kirchdoerfer wrote:
> Hi;
>
> just created the remote branch 4.0.1
>
> This branch is intended to work fixes for 4.0.1.
> I've currently only
> - updated webconf to fix Trac tickets #50, #51 and #52
> - fixed bug in hash shaper (crash on initialization mor
Hi;
just created the remote branch 4.0.1
This branch is intended to work fixes for 4.0.1.
I've currently only
- updated webconf to fix Trac tickets #50, #51 and #52
- fixed bug in hash shaper (crash on initialization more than 9 networks up to
/24 width)
and removed /bin directory.
Feel free
26 matches
Mail list logo
