Dear Scott, In message <[email protected]> you wrote: > > > I agree that #ifdef's should be avoided, but then here they also serve > > a documentation purpose as they clearly mark areas of code that are > > specific to U-Boot, or that are not used in U-Boot. > > git diff can do that too, without reducing readability or increasing the > likelihood of mismerges.
(git) diff needs a reference to diff against. Maybe I missed some earlier comments about that, but how exactly should this be done here? If we want to have strictly bisectable code in mainline, I don't really see how to provide an unmodified source reference to show the U-Boot specific diffs. Can you please explain (maybe again, sorry) how you think the code update should be done do both allow such a git diff and remain bisectable? The ways I can see all require a non-working / non-com- piling intermediate step. Best regards, Wolfgang Denk -- DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: [email protected] I'm what passes for a Unix guru in my office. This is a frightening concept. - Lee Ann Goldstein, in <[email protected]> _______________________________________________ U-Boot mailing list [email protected] http://lists.denx.de/mailman/listinfo/u-boot
