Date: Wed, 7 Jan 2009 20:18:06 -0500 From: "matt donovan" <kitchetech@gmail.com> To: "Peter Boosten" <peter@boosten.org> Cc: Albert.Shih@obspm.fr, freebsd-questions@freebsd.org, Johann Hasselbach <jhass88@gmail.com> Subject: Re: mergemaster goof when src upgrading 7.0 -> 7.1 Message-ID: <28283d910901071718m1b71eb41r22f9787d968802b@mail.gmail.com> In-Reply-To: <496511DE.2040001@boosten.org> References: <ab52c4f40901061328i254481d9obb36bcf53757d7db@mail.gmail.com> <4964467D.9020606@boosten.org> <20090107202206.GK99261@obspm.fr> <496511DE.2040001@boosten.org>
next in thread | previous in thread | raw e-mail | index | archive | help
T24gV2VkLCBKYW4gNywgMjAwOSBhdCAzOjM0IFBNLCBQZXRlciBCb29zdGVuIDxwZXRlckBib29z dGVuLm9yZz4gd3JvdGU6Cgo+IEFsYmVydCBTaGloIHdyb3RlOgo+Cj4+ICBMZSAwNy8wMS8yMDA5 IMOgIDA3OjA2OjUzKzAxMDAsIFBldGVyIEJvb3N0ZW4gYSDDqWNyaXQKPj4KPj4+IEpvaGFubiBI YXNzZWxiYWNoIHdyb3RlOgo+Pj4KPj4+PiBJIHdhcyBkb2luZyBhIHNyYyB1cGdyYWRlIGZyb20g Ny4wIHRvIDcuMQo+Pj4+Cj4+Pj4gQWZ0ZXIgaW5zdGFsbGtlcm5lbCwgaSByZWJvb3RlZCwgYW5k IGFjY2lkZW50bHkgcmFuICJtZXJnZW1hc3RlciIKPj4+PiBpbnN0ZWFkIG9mICJtZXJnZW1hc3Rl ciAtcCIgYmVmb3JlIGluc3RhbGx3b3JsZC4gSSBjdHJsLWMnZCBvbmNlIEkKPj4+PiByZWFsaXpl ZCB3aGF0IEkgaGFkIGRvbmUsIGJ1dCB0aGUgZGFtYWdlIHdhcyBkb25lLgo+Pj4+Cj4+Pj4gSXQg c2VlbXMgdG8gaGF2ZSBvdmVyd3JpdHRlbiBteSBwYXNzd29yZCBhbmQgZ3JvdXAgZmlsZXMuCj4+ Pj4KPj4+PiAgSSd2ZSBzdGF0ZWQgdGhpcyBiZWZvcmU6IEluIG15IG9waW5pb24gdGhpcyBlbnRp cmUgJ0kgd2FudCB0byBvdmVyd3JpdGUKPj4+IHlvdXIgcGFzc3dkIGZpbGUnIGF0dGl0dWRlIGZy b20gbWVyZ2VtYXN0ZXIgaXMgbm9uc2Vuc2U6IGF0IGluc3RhbGxhdGlvbgo+Pj4gdGltZSB5b3Un cmUgcmVxdWlyZWQgdG8gYWRkIGFuIGFkZGl0aW9uYWwgdXNlciwgYW5kIG1lcmdlbWFzdGVyIHdh bnRzIHRvCj4+PiB1bmRvIHRoYXQgYWdhaW4uCj4+Pgo+Pj4gIFdlbGwuLi5pJ20gbm90IGRldmVs b3BwZXIgYnV0IGxvbmcgdGltZSBhZ28sIHdoZW4gSSB1cGRhdGUgZnJvbSBGcmVlQlNECj4+IHgu eQo+PiB0byBGcmVlYnNkIHgrMSwoMC0xKSBJIGxvb3NlIG1hbnkgdGltZSB0byBmaW5kIHNvbWV0 aGluZyBkb24ndCB3b3JrCj4+IGJlY2F1c2UKPj4gdGhlIEZyZWVic2QgeCsxIG5lZWQgc29tZSBu ZXcgc3lzdGVtIGFjY291bnQuCj4+Cj4KPiBXZWxsLCBteSBwb2ludCBpcyB0aGF0IG1lcmdlbWFz dGVyIHNob3VsZG4ndCBoYXZlIHRvIGRlbGV0ZSBBTEwgYWNjb3VudHMsCj4ganVzdCB0byBhZGQg b25lLiBVc2VyIGFuZCBncm91cCBhY2NvdW50cyBjYW4gYmUgYWRkZWQgdG8gdGhlIHBhc3N3ZC9n cm91cAo+IGZpbGUgKndpdGhvdXQqIGRlbGV0aW5nIHRoZSBvdGhlcnMuCj4KPiBQZXRlcgo+IC0t Cj4gaHR0cDovL3d3dy5ib29zdGVuLm9yZwo+IF9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fCj4gZnJlZWJzZC1xdWVzdGlvbnNAZnJlZWJzZC5vcmcgbWFpbGlu ZyBsaXN0Cj4gaHR0cDovL2xpc3RzLmZyZWVic2Qub3JnL21haWxtYW4vbGlzdGluZm8vZnJlZWJz ZC1xdWVzdGlvbnMKPiBUbyB1bnN1YnNjcmliZSwgc2VuZCBhbnkgbWFpbCB0byAiCj4gZnJlZWJz ZC1xdWVzdGlvbnMtdW5zdWJzY3JpYmVAZnJlZWJzZC5vcmciCj4KCm1lcmdlbWFzdGVyIGRvZXNu J3QgZGVsZXRlIEFMTCBhY2NvdW50cyBpZiB5b3UgZG8gaXQgY29ycmVjdGx5LiBJIHVzdWFsbHkK bGVhdmUgdGhlIGZpbGVzIGZvciBsYXRlciBhbmQgdGhlbiBtYW51YWxseSBkbyBpdC4K
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?28283d910901071718m1b71eb41r22f9787d968802b>