From owner-freebsd-questions@FreeBSD.ORG Thu Jan 8 01:18:08 2009 Return-Path: Delivered-To: freebsd-questions@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 33CB1106564A for ; Thu, 8 Jan 2009 01:18:08 +0000 (UTC) (envelope-from kitchetech@gmail.com) Received: from mail-bw0-f20.google.com (mail-bw0-f20.google.com [209.85.218.20]) by mx1.freebsd.org (Postfix) with ESMTP id 77C758FC0C for ; Thu, 8 Jan 2009 01:18:07 +0000 (UTC) (envelope-from kitchetech@gmail.com) Received: by bwz13 with SMTP id 13so79296bwz.19 for ; Wed, 07 Jan 2009 17:18:06 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:message-id:date:from:to :subject:cc:in-reply-to:mime-version:content-type:references; bh=XyAXlKRssPEZa1eaiC3poT0hlJwAQS6IqfCRq1T2bGg=; b=rGXH3t2gqKuIKyZ8qTNLCMo9hrSlP6xsb2Yx5GJrG2PVb8zIPSvbKdX2UIYZFwWthB Ep1Py5SAm8pwiPj/iDc8lht9zKaax0sd3sI6hfniyprmu5zORvcawvWaaqMzggC8m2XX CJUBSTA/F9/rTlPTLcGGoReyycqUcwb2719Hg= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:to:subject:cc:in-reply-to:mime-version :content-type:references; b=k4NDWfrSVKxiParzX/hGdnmSK87SkwjQskQv37dN2pajg0re+Lni7CZHIptL4+HkGO DiffX8W5Pg5SfWiIDb4x3gwQ7mwt4fJ53VKWT5uIy8TAQ7h92+jA8TG1zlX5OjIaBcvp XuHA3MT89bF8MaKcCgVegee8vFZHnytuxtNFI= Received: by 10.180.205.20 with SMTP id c20mr8506461bkg.62.1231377486318; Wed, 07 Jan 2009 17:18:06 -0800 (PST) Received: by 10.181.14.6 with HTTP; Wed, 7 Jan 2009 17:18:06 -0800 (PST) Message-ID: <28283d910901071718m1b71eb41r22f9787d968802b@mail.gmail.com> Date: Wed, 7 Jan 2009 20:18:06 -0500 From: "matt donovan" To: "Peter Boosten" In-Reply-To: <496511DE.2040001@boosten.org> MIME-Version: 1.0 References: <4964467D.9020606@boosten.org> <20090107202206.GK99261@obspm.fr> <496511DE.2040001@boosten.org> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: base64 Content-Disposition: inline X-Content-Filtered-By: Mailman/MimeDel 2.1.5 Cc: Albert.Shih@obspm.fr, freebsd-questions@freebsd.org, Johann Hasselbach Subject: Re: mergemaster goof when src upgrading 7.0 -> 7.1 X-BeenThere: freebsd-questions@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: User questions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Jan 2009 01:18:08 -0000 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