Re: [ublas] dev branches

Subject: Re: [ublas] dev branches
From: Nasos Iliopoulos (nasos_i_at_[hidden])
Date: 2014-09-26 08:20:08

Yes, this is fine.

I would just like to note that  ide dev support is not used for building 
atm. It just there  for easier development  and supports qtcreator only. 
We could add build rules in there to use boost-build if this would be 
easier for some to work with ublas development.

-Nasos

On 09/25/2014 08:37 PM, Joaquim Duran wrote:
> With the merge of the branch 'feature0011 mvrange interface' in
> develop, a new test has been added so I'll merge the develop branch
> with 'feature0010 ide dev support' to build the new test program.
>
> Are there any inconvenient?
>
> Joaquim Duran
>
>
> 2014-09-17 1:24 GMT+02:00 Joaquim Duran <jduran.gm_at_[hidden]>:
>> The development of the branch 'ublas feature0011 mvrange interface'
>> was already finished (including cbegin, cend et al member functions).
>> The only issue is that the documentation of classes should be
>> improved.
>>
>> Joaquim Duran
>>
>> 2014-09-16 17:32 GMT+02:00 Nasos Iliopoulos <nasos_i_at_[hidden]>:
>>> David,
>>> I merged Joaquim's pull (ublas feature0011 mvrange interface ) into
>>> ublas/develop. There where some minor merge conflicts that got resolved. I
>>> think ublas/develop is almost ready now.
>>>
>>> I made a pull request of ublas/develop to boostorg/develop (ublas_upstream)
>>> and  I see that there are some more conflicts because boostorg/develop also
>>> changed (although we should avoid this as much as possible in order to
>>> eliminate those types of conflicts).
>>>
>>> Here is a test merge from boostorg/develop into ublas/develop:
>>>
>>> CONFLICT (content): Merge conflict in doc/index.html
>>> CONFLICT (modify/delete): doc/index.htm deleted in HEAD and modified in
>>> ublas_upstream/develop. Version ublas_upstream/develop of doc/index.htm left
>>> in tree.
>>> Auto-merging doc/html/index.html
>>> CONFLICT (content): Merge conflict in doc/html/index.html
>>> Automatic merge failed; fix conflicts and then commit the result.
>>>
>>> It seems that the conflicts are in the docs. Do you think you can resolve
>>> them?
>>>
>>> -Nasos
>>>
>>>
>>> On 09/13/2014 03:58 AM, David Bellot wrote:
>>>
>>> Hi devs,
>>>
>>> I want to reduce the number of development branches and start merging
>>> features that you guys develop into the main dev branch for the future Boost
>>> 1.57.
>>>
>>> I need to know who has a branch and is a candidate, ready for inclusion,
>>> into the next version.
>>>
>>> Cheers,
>>> David
>>>
>>>
>>> _______________________________________________
>>> ublas mailing list
>>> ublas_at_[hidden]
>>> http://lists.boost.org/mailman/listinfo.cgi/ublas
>>> Sent to: nasos_i_at_[hidden]
>>>
>>>
>>>
>>> _______________________________________________
>>> ublas mailing list
>>> ublas_at_[hidden]
>>> http://lists.boost.org/mailman/listinfo.cgi/ublas
>>> Sent to: jduran.gm_at_[hidden]
> _______________________________________________
> ublas mailing list
> ublas_at_[hidden]
> http://lists.boost.org/mailman/listinfo.cgi/ublas
> Sent to: athanasios.iliopoulos.ctr.gr_at_[hidden]