Richard Lowe wrote: > Mike Kupfer wrote: > >>>>>> "Jan" == Jan Setje-Eilers <setje at smack.Eng.Sun.COM> writes: [snip] > The majority of my problem was with (from Roland's initial mail): > > >> ####----> All changes to the upstream sources ====> MUST BE <==== stored > >> in *.diff files (and a README per *.diff) in usr/src/lib/libshell/misc/ > > My objection is based on the fact that taking this as written, the number of > these diffs would grow with every change made by us to the ksh93 source base > from here on out. > > Such that we aren't talking about "a diff", but a growing collection thereof > and a comment describing each. This is also why I suggested use of the SCM, > since the way I'm reading it, these diffs and READMEs would precisely > duplicate information already contained therein.
Uhm... the number should not grow in normal situations. There should be exactly one patch (the current one) since we try to avoid a diversion between our codebase and the upstream version. An exception maybe an emergency "hotfix" in a production branch when we can't deploy a fixed upstream version fast enougth - in that case a second *.diff would IMO mandatory. This diff would then be backed out when the official code from upstream gets deployed (it could be done with the SCM in this case but the *.diff file is an ugly reminder that we did a horrific blasphemy to the code, a reminder which scratches us as long as we don't deploy the fixed upstream sources (this part seems to work already as everyone is against *.diff files... that may help deploying the upstream sources even faster because the complains about the *.diff won't cease until it's "gone" again... :-) :-) )). ---- Bye, Roland -- __ . . __ (o.\ \/ /.o) roland.mainz at nrubsig.org \__\/\/__/ MPEG specialist, C&&JAVA&&Sun&&Unix programmer /O /==\ O\ TEL +49 641 7950090 (;O/ \/ \O;)
