Ralf's Remove CVS Id Commits

Thomas Doerfler Thomas.Doerfler at embedded-brains.de
Fri May 4 14:10:02 UTC 2012


removing the $Id$ stuff in the sources and build files surely is ONE
activity, which should be done or not. Commiting this is tiny steps is
quite similar to changing a source file with one separate patch per code

These changes belong together. Nobody wants this change to be done in
one BSP and NOT done in a different one.

Maybe you should get familiar with the idea that git does apply patches
in an atomic way and not in a uncorrelated file-by-file basis as CVS does.



Am 04.05.2012 15:40, schrieb Ralf Corsepius:
> On 05/04/2012 03:25 PM, Sebastian Huber wrote:
>> On 05/04/2012 03:16 PM, Ralf Corsepius wrote:
>>>> They only
>>>> touch build infrastructure from what I can tell.
>>> Correct.
>>> The number of commits originates from me trying to use "subsystem"
>>> commits.
>> Maybe we should discuss in advance if this "subsystem" based view is
>> what we want.
> Well, that's the style of commits I had performed 1000s of times
> throughout the years.
> The only difference is the commit list displaying commits differently now.
>>>> 3) Since he nibbled, I have no choice but to fight through
>>>> 100s of conflicts or redo my work to actually remove them
>>>> in the rest of the tree. You know, the minor part of the
>>>> source tree which includes the .c, .h, .S, .inl, README,
>>>> .t, .texi, etc
>>> Simply revert your changes on all *.ams, *.m4s. and *.ac before
>>> "master merging"
>> Yes, this would be my preferred solution.
> Wasn't "easier merging" and "distributed developent" one of the aspects
> git was advertised?
> Ralf
> _______________________________________________
> rtems-devel mailing list
> rtems-devel at rtems.org
> http://www.rtems.org/mailman/listinfo/rtems-devel

Embedded Brains GmbH
Thomas Doerfler           Obere Lagerstr. 30
D-82178 Puchheim          Germany
email: Thomas.Doerfler at embedded-brains.de
Phone: +49-89-18908079-2
Fax:   +49-89-18908079-9

More information about the devel mailing list