Garrett D'Amore wrote: > Roland Mainz wrote: > > Garrett D'Amore wrote: > >> Alan Coopersmith wrote: > >>> Roland Mainz wrote: > >>>> As said I can remove them for the Makefiles+code we "own" now and the > >>>> others as late as possible since the "ident" stuff is the _major_ source > >>>> of bitrot. I don't want to play the "catch the ident changes"-game over > >>>> and over again since the time for that comes from my almost non-existing > >>>> chunk of free time... > >>> Are you saying the ident lines in question are in the upstream source, not > >>> Sun added? If so, then leaving them in permanently and having the ON CRT > >>> waive their removal is the only sane choice. Upstream code should always > >>> be exempt from style and formatting rules such as ident removal and > >>> cstyle, > >>> since otherwise every update is an exercise in pointless time wasting. > >>> > >> Agreed, *IF* the ident keywords are *expanded* (as they should be in > >> this case). If they are not expanded with SCCS, then they can > >> potentially do more harm then good. > > > > See my reply - we don't have "ident" lines in the AST codebase. > > So, then why do we have them *anywhere*. There shouldn't be "bitrot". > You should purge them all once, and be done with it. Or am I badly > misunderstanding something here?
The issue is that the rules (AFAIK) require to remove the "ident" lines from all files we "touch". Since we have lots of changes in usr/src/pkgdefs/, Makefile.master and other parts we run into collisions when other people remove the "ident" lines before we do it. That was the major pain when merging the changes from the B84-based prototype011 to the Mercurial/HEAD-based prototype012 - all the changes to update the license template, the copyright year and ident lines caused massive bitrot and since "merge" is stupid any lines near these changes were rejected, too. Half a night was wasted with the merge, verification and testing... and I am not keen to do that again until we do the final putback. And I would even prefer to do this as a seperate putback (to avoid that this makes our 4.5MB monster patch even bigger) since this would save _lots_ of time on my side. ---- Bye, Roland -- __ . . __ (o.\ \/ /.o) roland.mainz at nrubsig.org \__\/\/__/ MPEG specialist, C&&JAVA&&Sun&&Unix programmer /O /==\ O\ TEL +49 641 3992797 (;O/ \/ \O;)
