[En-Nut-Discussion] Cortex M3 port finally integrated into trunk
bon at elektron.ikp.physik.tu-darmstadt.de
Thu Aug 23 12:25:29 CEST 2012
>>>>> "Harald" == Harald Kipp <harald.kipp at egnite.de> writes:
Harald> Hi Ole, On 15.05.2012 15:01, Ole Reinhardt wrote:
>> today I finally (re)integrated the dev_cm3_integration branch into
>> trunk. So integration of the Cortex M3 port is now finished.
>> Please do not use
>> branches/devnut_m3n branches/dev_cm3_integration
>> any more!!
>> Is there any need to keep these branches any longer? If not, I would
>> prefer to delete them! Especially the integration branch should not
>> be used any longer after merging back to trunk (according to the
>> subversion manuals).
Harald> Considering dev/usart.c, devnut_m3n added a lot more than just
Harald> cm3 porting. If we delete this branch, we are going to loose the
Harald> related history.
Harald> It turned out, that many changes in devnut_m3n should have been
Harald> done in the trunk and then merged into the branch. That also
Harald> would have made your re-integration effort much easier.
Harald> In the future we should take more care about the topic a branch
Harald> is created for.
And again I bring up the topic of switching to GIT...
Uwe Bonnes bon at elektron.ikp.physik.tu-darmstadt.de
Institut fuer Kernphysik Schlossgartenstrasse 9 64289 Darmstadt
--------- Tel. 06151 162516 -------- Fax. 06151 164321 ----------
More information about the En-Nut-Discussion