[prev in list] [next in list] [prev in thread] [next in thread] 

List:       orocos-dev
Subject:    [Orocos-Dev] RTT 1.10 branch 'release-ready' and misc.
From:       peter () thesourceworks ! com (Peter Soetens)
Date:       2009-10-28 12:14:44
Message-ID: 634c78ce0910280514t63c5f7dlcb93e634544c1ac1 () mail ! gmail ! com
[Download RAW message or body]

On Tue, Oct 27, 2009 at 23:37, Stephen Roderick <kiwi.net at mac.com> wrote:
> On Oct 27, 2009, at 18:07 , Peter Soetens wrote:
>
>> On Tue, Oct 27, 2009 at 22:35, Stephen Roderick <kiwi.net at mac.com> wrote:
>>>
>>> On Oct 27, 2009, at 11:14 , Peter Soetens wrote:
>>>
>>>> On Tue, Oct 27, 2009 at 00:42, S Roderick <kiwi.net at mac.com> wrote:
>>>>>
>>>>> On Oct 22, 2009, at 14:06 , Stephen Roderick wrote:
>>>>>
>>>>>> On Sep 14, 2009, at 04:47 , Peter Soetens wrote:
>>>>>>
>>>>>>> On Sun, Sep 13, 2009 at 21:53, S Roderick <kiwi.net at mac.com> wrote:
>>>>>>>>
>>>>>>>> On Sep 11, 2009, at 09:30 , Stephen Roderick wrote:
>>>>>>>>
>>>>>>>> On Sep 11, 2009, at 09:23 , Peter Soetens wrote:
>>>>>>>>
>>>>>>>> On Fri, Sep 11, 2009 at 14:40, S Roderick <kiwi.net at mac.com> wrote:
>>>>>>>>>
>>>>>>>>> On Sep 11, 2009, at 05:15 , Peter Soetens wrote:
>>>>>>>>>
>>>
>>> <snip>
>>>
>>>>>>
>>>>> Attached patch fixes issues for earlier versions of boost. Somewhere
>>>>> between
>>>>> 1.37 and 1.40, boost explicitly prevents using this floating point
>>>>> comparison on integral types.
>>>>>
>>>>> Tested on Ubuntu Jaunty with 1.37 and Snow Leopard with 1.40
>>>>
>>>> Something is wrong with your local branch. This was already fixed on
>>>> September 14th on all branches.
>>>>
>>>> Peter
>>>
>>> Very likely is a problem at my end. The last change I see from you on
>>> origin/master or origin/HEAD is d74559df1f90cca9ed7267bc2cf9eaf3b98daba4
>>> on
>>> 2009-07-23. I see activity on origin/rtt-1.0-svn-updates in September,
>>> and
>>> activity in origin/rtt-2.0-mainline just a few days ago.
>>
>> Oh god. When you said you were tracking, I though you were using the
>> svn trunk/branches for tracking 1.x using git-svn.. I'm seldomly
>> pushing the git branch (rtt-1.0-svn-patches) for 1.x, since I always
>> dcommit to svn and svn is the official trunk/branch. Also master is
>> indeed not used until 2.0 mainline is merged into master. You couldn't
>> know all that.
>>
>> So leave your setup as is, and I'll repush rtt-1.0-svn-patches to git.
>> You'll need to rebase probably (I wouldn't merge if I were you because
>> this kind-of entangles your patches to the point where the merge
>> happended, while a rebase forces you to maintain and inspect the
>> differences with upstream.
>
> Ok, that answers many questions I've had!! I'm git tracking the RTT and OCL
> git repo's, and git-svn tracking KDL and BFL.
>
> Am I better of git-svn tracking RTT and OCL from svn/trunk, for v1.x? I
> don't want to make more work for you - you've got enough going on. And I'm
> not exactly a "low volume" contributor ... ;-)

Keep your setup. I'll modify my back/for porting scripts to do a git
push each time svn is updated.

Peter

[prev in list] [next in list] [prev in thread] [next in thread]