Ralf's Remove CVS Id Commits
Sebastian Huber
sebastian.huber at embedded-brains.de
Fri May 4 13:25:42 UTC 2012
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.
>> 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.
--
Sebastian Huber, embedded brains GmbH
Address : Obere Lagerstr. 30, D-82178 Puchheim, Germany
Phone : +49 89 18 90 80 79-6
Fax : +49 89 18 90 80 79-9
E-Mail : sebastian.huber at embedded-brains.de
PGP : Public key available on request.
Diese Nachricht ist keine geschäftliche Mitteilung im Sinne des EHUG.
More information about the devel
mailing list