[En-Nut-Discussion] devnut_m3n: Merging to trunk, the SVN way
bon at elektron.ikp.physik.tu-darmstadt.de
Tue Mar 20 10:58:48 CET 2012
(resent, as there was no reaction until now)
>>>>> "Ulrich" == Ulrich Prinz <ulrich.prinz at googlemail.com> writes:
Ulrich> Right: Uwe consider the following steps: Checkout a fresh copy
Ulrich> from devnut_m3n Branch this to i.e. dev_uwe_cm3integration and,
Ulrich> important!, switch this copy to this new branch.
Do I have appropriate rights on sourceforge?
Ulrich> ( or use repository tools to copy devnut_m3n to
Ulrich> dev_uwe_cm3integration and checkout that branch directly)
>> For sure you could also create a new branch from trunk and merge the
>> devnut_m3n branch to this new branch.
Ulrich> And in opposite to that, merge all newer revisions from trunk to
Ulrich> the branch. Where newer means everything that is newer in trunk
Ulrich> compared to devnut_m3n is now merged to dev_uwe_cm3integration.
Ulrich> After that you start to compile for all and any supported
Ulrich> platform and check for errors, warnings and so on.
Ahm, I can do some test for AVR and STM32, but that's all.
After integration help and review from others is needed.
When checking in revisions from trunk, should I check in the results after
resolving conflicts or should all happen one single step? I think the first
solution is better, but it will create a lot of clutter in the log.
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