Ralf's Remove CVS Id Commits

Ralf Corsepius ralf.corsepius at rtems.org
Fri May 4 13:40:32 UTC 2012


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



More information about the devel mailing list