From owner-freebsd-stable@FreeBSD.ORG Mon Mar 10 04:23:37 2014 Return-Path: Delivered-To: stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id ABBC3A25 for ; Mon, 10 Mar 2014 04:23:37 +0000 (UTC) Received: from mail-s68.mailgun.info (mail-s68.mailgun.info [184.173.153.196]) by mx1.freebsd.org (Postfix) with ESMTP id 59F75F13 for ; Mon, 10 Mar 2014 04:23:36 +0000 (UTC) DKIM-Signature: a=rsa-sha256; v=1; c=relaxed/relaxed; d=miator.net; q=dns/txt; s=krs; t=1394425416; h=Mime-Version: In-Reply-To: References: Date: Message-Id: Subject: From: To: Cc: Content-Type: Sender; bh=COJwgIPFlAVn5XAwjRQghlnLy3PHvaIiuo7axt4cYB0=; b=jrQw0y5FHSDAWsnsSArsXyem1xpkDO9/6AZepIkFqN7yOz1PxGKwH2Egy321DPjstkYQJSZK 74q5/miFFyaW1OvsN7/PZhlE6r6ZirDItJzfOBDN9xyiRjd6ZXPQz2jES/EzuKeD7EN+XhFx ZC6+S/1caj//QdmcF171Xxn2lPE= DomainKey-Signature: a=rsa-sha1; c=nofws; d=miator.net; s=krs; q=dns; h=Mime-Version: In-Reply-To: References: Date: Message-Id: Subject: From: To: Cc: Content-Type: Sender; b=M58K/uWiKIAgsqtRxNVWJZF57I5uubmW4HX+ZqRRiB0jIk7lwwDeklF2nXzFGS+7E642Q/ 5UJsGtiNoynEaDX+IVHj3xz6oNApJyxSXgtrjYrVZQ/gL63lNG5DxVQVcuxDxD728uoItQF2 zxk3df5Tid+ixOp8JsiEfWrmXtR3E= Received: from mail-ve0-f176.google.com (mail-ve0-f176.google.com [209.85.128.176]) by mxa.mailgun.org with ESMTP id 531d3e47.9999f30-in1; Mon, 10 Mar 2014 04:23:35 -0000 (UTC) Received: by mail-ve0-f176.google.com with SMTP id cz12so6409506veb.21 for ; Sun, 09 Mar 2014 21:23:33 -0700 (PDT) X-Google-Dkim-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=COJwgIPFlAVn5XAwjRQghlnLy3PHvaIiuo7axt4cYB0=; b=UgIBu9wQEDfvVtiZcOy9YJ0vCEkWtQwEBmgS2kYRa0BCOKh6t8RC6kL5eEBaS8T8Wq K48MVm3CRspEOFtu26v0bYY3cb4hhgPG2cMnhVCc+wXx+iPU8togr46Cp8/l1fPyv8Ee iAevo/EInsZypRJTy8AObhiTzUPpSEzAhRUyVW9xCrzqYldFHOr86bWW0drquqqCd33I 2BuCHJz7ny+BB6bEarDy2Zng8GnP7nO7FkORmFhW5HM7ijjYqS6bSM/bvOx6hjGQjAFZ yUl+LZqMz/bay+2YfIKd8AkyiYJENn3x51EpyyCSraZ1ifoaga3V10Mw8DQppdMdl3Ks KkfQ== Mime-Version: 1.0 X-Received: by 10.220.114.135 with SMTP id e7mr1303850vcq.23.1394425413348; Sun, 09 Mar 2014 21:23:33 -0700 (PDT) Received: by 10.220.86.65 with HTTP; Sun, 9 Mar 2014 21:23:32 -0700 (PDT) In-Reply-To: <20140310031449.GE2665@rancor.immure.com> References: <20140308162614.GC94968@rancor.immure.com> <20140308171824.GA31887@spectrum.skysmurf.nl> <20140308172501.GH1626@albert.catwhisker.org> <20140308214410.GC2665@rancor.immure.com> <20140310031449.GE2665@rancor.immure.com> Date: Mon, 10 Mar 2014 00:23:32 -0400 Message-Id: Subject: Re: vi loop when resizing window From: Zhihao Yuan To: Bob Willcox Content-Type: multipart/mixed; boundary="047d7b342d8a6dc47104f438f7cf" X-Mailgun-Sid: WyIyZjNjMiIsICJzdGFibGVAZnJlZWJzZC5vcmciLCAiNjkxMTAiXQ== Sender: zy@miator.net Cc: Zhihao Yuan , FreeBSD Stable ML X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: Production branch of FreeBSD source code List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 10 Mar 2014 04:23:37 -0000 --047d7b342d8a6dc47104f438f7cf Content-Type: text/plain; charset=UTF-8 On Sun, Mar 9, 2014 at 11:14 PM, Bob Willcox wrote: > ------------------------------------------------------------------------ > r259073 | peter | 2013-12-07 12:23:29 -0600 (Sat, 07 Dec 2013) | 13 lines > > Hoist all the mergeinfo up to the root in preparation for enforcing merges > to the root only. All MFC's were rerecorded to the root. r259073 < r259088, I would suggest to try whether the attached patch helps. I just tried `make buildworld` on HEAD, and did not repro your problem. -- Zhihao Yuan, ID lichray The best way to predict the future is to invent it. ___________________________________________________ 4BSD -- http://4bsd.biz/ --047d7b342d8a6dc47104f438f7cf Content-Type: text/x-patch; charset=US-ASCII; name="182463.patch" Content-Disposition: attachment; filename="182463.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_hsl8vqgq0 SW5kZXg6IGNvbW1vbi9rZXkuYwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBjb21tb24va2V5LmMJKHJldmlzaW9u IDI1OTA4NykKKysrIGNvbW1vbi9rZXkuYwkocmV2aXNpb24gMjU5MDg4KQpAQCAtMTAsNyArMTAs NyBAQAogI2luY2x1ZGUgImNvbmZpZy5oIgogCiAjaWZuZGVmIGxpbnQKLXN0YXRpYyBjb25zdCBj aGFyIHNjY3NpZFtdID0gIiRJZDoga2V5LmMsdiAxMC41MyAyMDEzLzAzLzExIDAxOjIwOjUzIHlh bXQgRXhwICQiOworc3RhdGljIGNvbnN0IGNoYXIgc2Njc2lkW10gPSAiJElkOiBrZXkuYyx2IDEw LjU0IDIwMTMvMTEvMTMgMTI6MTU6MjcgenkgRXhwICQiOwogI2VuZGlmIC8qIG5vdCBsaW50ICov CiAKICNpbmNsdWRlIDxzeXMvdHlwZXMuaD4KQEAgLTI3Miw3ICsyNzIsNyBAQAogCSAqIFRoZSBj b2RlIHByaW50cyBub24tcHJpbnRhYmxlIHdpZGUgY2hhcmFjdGVycyBpbiA0IG9yIDUgZGlnaXRz CiAJICogVW5pY29kZSBlc2NhcGUgc2VxdWVuY2VzLCBzbyBvbmx5IHN1cHBvcnRzIHBsYW5lIDAg dG8gMTUuCiAJICovCi0JaWYgKElTUFJJTlQoYWNoKSkKKwlpZiAoQ0FOX1BSSU5UKHNwLCBhY2gp KQogCQlnb3RvIGRvbmU7CiBub3ByOglpZiAoaXNjbnRybChjaCkgJiYgKGNoIDwgMHgyMCB8fCBj aCA9PSAweDdmKSkgewogCQlzcC0+Y25hbWVbMF0gPSAnXic7CkluZGV4OiBjb21tb24va2V5LmgK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gY29tbW9uL2tleS5oCShyZXZpc2lvbiAyNTkwODcpCisrKyBjb21tb24v a2V5LmgJKHJldmlzaW9uIDI1OTA4OCkKQEAgLTYsNyArNiw3IEBACiAgKgogICogU2VlIHRoZSBM SUNFTlNFIGZpbGUgZm9yIHJlZGlzdHJpYnV0aW9uIGluZm9ybWF0aW9uLgogICoKLSAqCSRJZDog a2V5LmgsdiAxMC41NSAyMDEyLzEwLzA3IDAxOjMxOjE3IHp5IEV4cCAkCisgKgkkSWQ6IGtleS5o LHYgMTAuNTYgMjAxMy8xMS8xMyAxMjoxNToyNyB6eSBFeHAgJAogICovCiAKICNpbmNsdWRlICJt dWx0aWJ5dGUuaCIKQEAgLTIzLDggKzIzLDkgQEAKICNkZWZpbmUgSU5QVVQySU5UNShzcCxjdyxu LG5sZW4sdyx3bGVuKQkJCQkJICAgIFwKICAgICBzcC0+Y29udi5pbnB1dDJpbnQoc3AsIG4sIG5s ZW4sICYoY3cpLCAmd2xlbiwgJncpCiAjZGVmaW5lIENPTlNUCisjZGVmaW5lIElOVElTV0lERShj KSAgICAgICAgKHdjdG9iKGMpID09IEVPRikKICNkZWZpbmUgQ0hBUl9XSURUSChzcCwgY2gpICB3 Y3dpZHRoKGNoKQotI2RlZmluZSBJTlRJU1dJREUoYykJKHdjdG9iKGMpID09IEVPRikKKyNkZWZp bmUgQ0FOX1BSSU5UKHNwLCBjaCkgICAoQ0hBUl9XSURUSChzcCwgY2gpID4gMCkKICNlbHNlCiAj ZGVmaW5lIEZJTEUySU5UNShzcCxidWYsbixubGVuLHcsd2xlbikgXAogICAgICh3ID0gbiwgd2xl biA9IG5sZW4sIDApCkBAIC0zNiw5ICszNywxMCBAQAogICAgIChuID0gdywgbmxlbiA9IHdsZW4s IDApCiAjZGVmaW5lIElOUFVUMklOVDUoc3AsYnVmLG4sbmxlbix3LHdsZW4pIFwKICAgICAodyA9 IG4sIHdsZW4gPSBubGVuLCAwKQotI2RlZmluZSBDT05TVCBjb25zdAotI2RlZmluZSBJTlRJU1dJ REUoYykJICAgIDAKKyNkZWZpbmUgQ09OU1QgICAgICAgICAgICAgICBjb25zdAorI2RlZmluZSBJ TlRJU1dJREUoYykgICAgICAgIDAKICNkZWZpbmUgQ0hBUl9XSURUSChzcCwgY2gpICAxCisjZGVm aW5lIENBTl9QUklOVChzcCwgY2gpICAgaXNwcmludChjaCkKICNlbmRpZgogI2RlZmluZSBGSUxF MklOVChzcCxuLG5sZW4sdyx3bGVuKQkJCQkJICAgIFwKICAgICBGSUxFMklOVDUoc3Asc3AtPmN3 LG4sbmxlbix3LHdsZW4pCkluZGV4OiBjbC9jbF90ZXJtLmMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gY2wvY2xf dGVybS5jCShyZXZpc2lvbiAyNTkwODcpCisrKyBjbC9jbF90ZXJtLmMJKHJldmlzaW9uIDI1OTA4 OCkKQEAgLTEwLDcgKzEwLDcgQEAKICNpbmNsdWRlICJjb25maWcuaCIKIAogI2lmbmRlZiBsaW50 Ci1zdGF0aWMgY29uc3QgY2hhciBzY2NzaWRbXSA9ICIkSWQ6IGNsX3Rlcm0uYyx2IDEwLjMzIDIw MTIvMDQvMjEgMjM6NTE6NDYgenkgRXhwICQiOworc3RhdGljIGNvbnN0IGNoYXIgc2Njc2lkW10g PSAiJElkOiBjbF90ZXJtLmMsdiAxMC4zNCAyMDEzLzEyLzA3IDE2OjIxOjE0IHdqZW5rbmVyIEV4 cCAkIjsKICNlbmRpZiAvKiBub3QgbGludCAqLwogCiAjaW5jbHVkZSA8c3lzL3R5cGVzLmg+CkBA IC0xODcsMTQgKzE4NywxOCBAQAogaW50CiBjbF90ZXJtX2VuZChHUyAqZ3ApCiB7Ci0JU0VRICpx cCwgKm5xcDsKKwlTRVEgKnFwLCAqbnFwLCAqcHJlX3FwID0gTlVMTDsKIAogCS8qIERlbGV0ZSBz Y3JlZW4gc3BlY2lmaWMgbWFwcGluZ3MuICovCiAJU0xJU1RfRk9SRUFDSF9TQUZFKHFwLCBncC0+ c2VxcSwgcSwgbnFwKQogCQlpZiAoRl9JU1NFVChxcCwgU0VRX1NDUkVFTikpIHsKLQkJCVNMSVNU X1JFTU9WRV9IRUFEKGdwLT5zZXFxLCBxKTsKKwkJCWlmIChxcCA9PSBTTElTVF9GSVJTVChncC0+ c2VxcSkpCisJCQkJU0xJU1RfUkVNT1ZFX0hFQUQoZ3AtPnNlcXEsIHEpOworCQkJZWxzZQorCQkJ CVNMSVNUX1JFTU9WRV9BRlRFUihwcmVfcXAsIHEpOwogCQkJKHZvaWQpc2VxX2ZyZWUocXApOwot CQl9CisJCX0gZWxzZQorCQkJcHJlX3FwID0gcXA7CiAJcmV0dXJuICgwKTsKIH0KIApJbmRleDog Lgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSAuCShyZXZpc2lvbiAyNTkwODcpCisrKyAuCShyZXZpc2lvbiAyNTkw ODgpCgpQcm9wZXJ0eSBjaGFuZ2VzIG9uOiAuCl9fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX18KTW9kaWZpZWQ6IHN2bjptZXJn ZWluZm8KICAgTWVyZ2VkIC92ZW5kb3IvbnZpL2Rpc3Q6cjI1OTA4Ngo= --047d7b342d8a6dc47104f438f7cf--