> As Shawn noticed... the open-sourcing of the e1000g driver yesterday > contained proprietary source code headers in the diff. This was a > mistake by the engineer moving the code, and needs to be re-bridged. We > can't have proprietary source code headers in public open source code, > no matter how minor and trivial the code is. > > I've re-bridged the putback in onnv/onnv-gate, which means you will need > to roll your repositories back to revision 3567:6d1c4dd92b63, or else > your repositories will grow a new head.
Somehow that doesn't work for me. Yesterday I had already pulled upto changeset 3571:7e9b2efbab2e "6519951 bfu is just another word for exit today (RPATH -> RUNPATH conversion bites us)" A "hg rollback" gets me back to changeset 3561:eb8f709e6f16 "6498959 print usb device info for developers and users"; this is another six changesets before the revision indicated above: % hg rollback rolling back last transaction % hg serve ... So the e1000 proprietary source code header is gone.... Now I pull fresh sources with "hg pull", like this.... % hg pull -e 'ssh -C' pulling from ssh://[EMAIL PROTECTED]/hg/onnv/onnv-gate searching for changes adding changesets adding manifests adding file changes added 10 changesets with 68 changes to 68 files (run 'hg update' to get a working copy) ... and once again I see the top secret diff (assuming the following one is the troublemaker): deleted_files/usr/src/uts/common/io/e1000g/e1000g_ddict.h revision 3568:b2b402e6f340 parent 3567:6d1c4dd92b63 child 3569:c7c25e633fce --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/deleted_files/usr/src/uts/common/io/e1000g/e1000g_ddict.h Wed Jan 31 17:42:17 2007 -0800 @@ -0,0 +1,68 @@ ... This message posted from opensolaris.org _______________________________________________ opensolaris-code mailing list [email protected] http://mail.opensolaris.org/mailman/listinfo/opensolaris-code
