Date: Thu, 27 Oct 2011 12:05:39 -0700 From: Craig Rodrigues <rodrigc@crodrigues.org> To: Doug Barton <dougb@freebsd.org> Cc: freebsd-current@freebsd.org Subject: Re: sys/conf/newvers.sh vs. subversion-1.7 Message-ID: <CAG=rPVfwdXDhyaaT_xXU19RiJtWRxT2bC_Pw_Ph8guJdhLyskA@mail.gmail.com> In-Reply-To: <4EA71713.3020404@FreeBSD.org> References: <20111020114844.GK59810@albert.catwhisker.org> <20111020122121.GL59810@albert.catwhisker.org> <201110211636.05917.jhb@freebsd.org> <20111025140000.GA8559@albert.catwhisker.org> <CAG=rPVdS%2BPOJqATw7kmb0%2Bb9byp3r2Vp8o=ELRFj9K7rA1zpYA@mail.gmail.com> <4EA71713.3020404@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--00032555767a5d6ce504b04c7555 Content-Type: text/plain; charset=ISO-8859-1 On Tue, Oct 25, 2011 at 1:07 PM, Doug Barton <dougb@freebsd.org> wrote: > The attached implements that, and is almost certainly the right way to > go. It would be nice if someone could test it, and better if someone > else could commit it. I swore after the last time that I'd stay away > from that file precisely because of all the bikeshed stupidity that this > issue creates. Hi, I tested your patch and it works. I am attaching vers.c files which I generated in trees which were under svn control, and not under svn control. -- Craig Rodrigues rodrigc@crodrigues.org --00032555767a5d6ce504b04c7555 Content-Type: text/plain; charset=US-ASCII; name="newvers.sh.diff" Content-Disposition: attachment; filename="newvers.sh.diff" Content-Transfer-Encoding: base64 X-Attachment-Id: 61458144b41871ad_0.1 SW5kZXg6IG5ld3ZlcnMuc2gKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gbmV3dmVycy5zaAkocmV2aXNpb24gMjI2 NDc0KQorKysgbmV3dmVycy5zaAkod29ya2luZyBjb3B5KQpAQCAtODgsNyArODgsNyBAQAogaT1g JHtNQUtFOi1tYWtlfSAtViBLRVJOX0lERU5UYAogCiBmb3IgZGlyIGluIC9iaW4gL3Vzci9iaW4g L3Vzci9sb2NhbC9iaW47IGRvCi0JaWYgWyAtZCAiJHtTWVNESVJ9Ly5zdm4iIC1hIC14ICIke2Rp cn0vc3ZudmVyc2lvbiIgXSA7IHRoZW4KKwlpZiBbIC14ICIke2Rpcn0vc3ZudmVyc2lvbiIgXSA7 IHRoZW4KIAkJc3ZudmVyc2lvbj0ke2Rpcn0vc3ZudmVyc2lvbgogCQlicmVhawogCWZpCkBAIC05 OSw4ICs5OSwxMiBAQAogZG9uZQogCiBpZiBbIC1uICIkc3ZudmVyc2lvbiIgXSA7IHRoZW4KLSAg ICBlY2hvICIkc3ZudmVyc2lvbiIKLQlzdm49IiByYGNkICR7U1lTRElSfSAmJiAkc3ZudmVyc2lv bmAiCisJZWNobyAiJHN2bnZlcnNpb24iCisJc3ZuPWBjZCAke1NZU0RJUn0gJiYgJHN2bnZlcnNp b25gCisJY2FzZSAiJHN2biIgaW4KKwlbMC05XSopCXN2bj0iIHIke3N2bn0iIDs7CisJKikJdW5z ZXQgc3ZuIDs7CisJZXNhYwogZmkKIAogaWYgWyAtbiAiJGdpdF9jbWQiIF0gOyB0aGVuCg== --00032555767a5d6ce504b04c7555 Content-Type: text/plain; charset=US-ASCII; name="vers.c.with_svn.txt" Content-Disposition: attachment; filename="vers.c.with_svn.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gua4gnen1 LyotCiAqIENvcHlyaWdodCAoYykgMTk5Mi0yMDExIFRoZSBGcmVlQlNEIFByb2plY3QuCiAqIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAqCiAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKICogYXJlIG1l dDoKICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgogKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAogKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhl CiAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo IHRoZSBkaXN0cmlidXRpb24uCiAqCiAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhF IEFVVEhPUiBBTkQgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJyBBTkQKICogQU5ZIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCiAq IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUiBQVVJQT1NFCiAqIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwg VEhFIEFVVEhPUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFCiAqIEZPUiBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFM CiAqIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RiBTVUJTVElUVVRFIEdPT0RTCiAqIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKQogKiBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVAog KiBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZCiAqIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YKICogU1VDSCBEQU1BR0UuCiAqCiAq LwoKI2RlZmluZSBTQ0NTU1RSICJAKCMpRnJlZUJTRCA5LjAtQkVUQTIgIzAgcjIyNTM2ODoyMjYx NzlNOiBUdWUgT2N0IDI1IDIzOjM1OjExIFBEVCAyMDExIgojZGVmaW5lIFZFUlNUUiAiRnJlZUJT RCA5LjAtQkVUQTIgIzAgcjIyNTM2ODoyMjYxNzlNOiBUdWUgT2N0IDI1IDIzOjM1OjExIFBEVCAy MDExXG4gICAgcm9kcmlnY0BkaWJibGVyLmNyb2RyaWd1ZXMub3JnOi91c3Ivb2JqL29wdDIvYnJh bmNoZXMvaGVhZC9zcmMvc3lzL01ZS0VSTkVMMVxuIgojZGVmaW5lIFJFTFNUUiAiOS4wLUJFVEEy IgoKY2hhciBzY2NzW3NpemVvZihTQ0NTU1RSKSA+IDEyOCA/IHNpemVvZihTQ0NTU1RSKSA6IDEy OF0gPSBTQ0NTU1RSOwpjaGFyIHZlcnNpb25bc2l6ZW9mKFZFUlNUUikgPiAyNTYgPyBzaXplb2Yo VkVSU1RSKSA6IDI1Nl0gPSBWRVJTVFI7CmNoYXIgb3N0eXBlW10gPSAiRnJlZUJTRCI7CmNoYXIg b3NyZWxlYXNlW3NpemVvZihSRUxTVFIpID4gMzIgPyBzaXplb2YoUkVMU1RSKSA6IDMyXSA9IFJF TFNUUjsKaW50IG9zcmVsZGF0ZSA9IDkwMDA0MzsKY2hhciBrZXJuX2lkZW50W10gPSAiR0VORVJJ QyI7Cg== --00032555767a5d6ce504b04c7555 Content-Type: text/plain; charset=US-ASCII; name="vers.c.without_svn.txt" Content-Disposition: attachment; filename="vers.c.without_svn.txt" Content-Transfer-Encoding: base64 X-Attachment-Id: f_gua4gz0b2 LyotCiAqIENvcHlyaWdodCAoYykgMTk5Mi0yMDExIFRoZSBGcmVlQlNEIFByb2plY3QuCiAqIEFs bCByaWdodHMgcmVzZXJ2ZWQuCiAqCiAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNl IGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogKiBtb2RpZmljYXRpb24sIGFyZSBw ZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKICogYXJlIG1l dDoKICogMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBh Ym92ZSBjb3B5cmlnaHQKICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgogKiAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5 IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAogKiAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhl CiAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRo IHRoZSBkaXN0cmlidXRpb24uCiAqCiAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhF IEFVVEhPUiBBTkQgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJyBBTkQKICogQU5ZIEVYUFJFU1MgT1Ig SU1QTElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFCiAq IElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEg UEFSVElDVUxBUiBQVVJQT1NFCiAqIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwg VEhFIEFVVEhPUiBPUiBDT05UUklCVVRPUlMgQkUgTElBQkxFCiAqIEZPUiBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFM CiAqIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RiBTVUJTVElUVVRFIEdPT0RTCiAqIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKQogKiBIT1dFVkVSIENBVVNFRCBBTkQg T04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVAog KiBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZCiAqIE9VVCBPRiBUSEUgVVNFIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YKICogU1VDSCBEQU1BR0UuCiAqCiAq LwoKI2RlZmluZSBTQ0NTU1RSICJAKCMpRnJlZUJTRCA5LjAtQkVUQTIgIzU6IFR1ZSBPY3QgMjUg MjM6MDc6NTEgUERUIDIwMTEiCiNkZWZpbmUgVkVSU1RSICJGcmVlQlNEIDkuMC1CRVRBMiAjNTog VHVlIE9jdCAyNSAyMzowNzo1MSBQRFQgMjAxMVxuICAgIHJvZHJpZ2NAZGliYmxlci5jcm9kcmln dWVzLm9yZzovdXNyL29iai9vcHQyL2JyYW5jaGVzL2hlYWQvc3JjL3N5cy9NWUtFUk5FTDFcbiIK I2RlZmluZSBSRUxTVFIgIjkuMC1CRVRBMiIKCmNoYXIgc2Njc1tzaXplb2YoU0NDU1NUUikgPiAx MjggPyBzaXplb2YoU0NDU1NUUikgOiAxMjhdID0gU0NDU1NUUjsKY2hhciB2ZXJzaW9uW3NpemVv ZihWRVJTVFIpID4gMjU2ID8gc2l6ZW9mKFZFUlNUUikgOiAyNTZdID0gVkVSU1RSOwpjaGFyIG9z dHlwZVtdID0gIkZyZWVCU0QiOwpjaGFyIG9zcmVsZWFzZVtzaXplb2YoUkVMU1RSKSA+IDMyID8g c2l6ZW9mKFJFTFNUUikgOiAzMl0gPSBSRUxTVFI7CmludCBvc3JlbGRhdGUgPSA5MDAwNDM7CmNo YXIga2Vybl9pZGVudFtdID0gIkdFTkVSSUMiOwo= --00032555767a5d6ce504b04c7555--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG=rPVfwdXDhyaaT_xXU19RiJtWRxT2bC_Pw_Ph8guJdhLyskA>