[En-Nut-Discussion] Cortex M3 port finally integrated into trunk

Uwe Bonnes bon at elektron.ikp.physik.tu-darmstadt.de
Thu Aug 23 22:05:30 CEST 2012

>>>>> "Harald" == Harald Kipp <harald.kipp at egnite.de> writes:

    Harald> Hi Uwe, On 23.08.2012 12:25, Uwe Bonnes wrote:
    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...

    Harald> How do you think that would have avoided the problems with the
    Harald> m3n branch, loosing sync and introducing more than just the cm3
    Harald> port?

With git you can cherry pick patches.

    Harald> That's not a didactic question. I do not have sufficient
    Harald> experience with git, rarely using it for downloading source
    Harald> code.

I actually didn't merge branches with git yet, nor did I use cherry-picking.

    Harald> So far I learned, that the main benefit is to have a local
    Harald> repository (Sourceforge is quite reliable) and simplifies
    Harald> merging (svn merging is sometimes a bit tricky, but you can get
    Harald> used to it).

A "git log -p <some-file.c>" is blinding fast. svn log is slow like a
snail. An finding the diff is also much harder.

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 mailing list