From owner-freebsd-stable@FreeBSD.ORG Mon Mar 10 03:15:11 2014 Return-Path: Delivered-To: stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 9138D16E for ; Mon, 10 Mar 2014 03:15:11 +0000 (UTC) Received: from maul.immure.com (immure.com [107.218.164.241]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 5EB26A20 for ; Mon, 10 Mar 2014 03:15:08 +0000 (UTC) Received: from [10.1.132.9] (helo=rancor.immure.com) by maul.immure.com with esmtp (Exim 4.80.1 (FreeBSD)) (envelope-from ) id 1WMqfx-000BL6-Pz; Sun, 09 Mar 2014 22:14:52 -0500 Received: from rancor.immure.com (localhost [127.0.0.1]) by rancor.immure.com (8.14.8/8.14.8) with ESMTP id s2A3EnFk069384; Sun, 9 Mar 2014 22:14:49 -0500 (CDT) (envelope-from bob@rancor.immure.com) Received: (from bob@localhost) by rancor.immure.com (8.14.8/8.14.6/Submit) id s2A3En9a069383; Sun, 9 Mar 2014 22:14:49 -0500 (CDT) (envelope-from bob) Date: Sun, 9 Mar 2014 22:14:49 -0500 From: Bob Willcox To: Zhihao Yuan Message-ID: <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> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.5.22 (2013-10-16) X-SA-Exim-Connect-IP: 10.1.132.9 X-SA-Exim-Mail-From: bob@immure.com X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on maul.immure.com X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=ALL_TRUSTED,BAYES_00 autolearn=ham version=3.3.2 Subject: Re: vi loop when resizing window X-SA-Exim-Version: 4.2 X-SA-Exim-Scanned: Yes (on maul.immure.com) Cc: FreeBSD Stable ML X-BeenThere: freebsd-stable@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list Reply-To: Bob Willcox 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 03:15:11 -0000 On Sun, Mar 09, 2014 at 01:03:13PM -0400, Zhihao Yuan wrote: > On Sat, Mar 8, 2014 at 4:44 PM, Bob Willcox wrote: > > on the chance that it might be due to a difference between your level and mine > > but the problem persists. Any change to the vi xterm window puts vi into a > > loop that requires a 'kill -9' to get it out of. > > Currently I cannot reproduce your problem (as nvi's maintainer). > Can you go to /usr/src/contrib/nvi and show me the top commit? > Is this what you are looking for: ------------------------------------------------------------------------ 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. Going forward, if an MFC includes mergeinfo, it will need to be made to the root and committed from the root. Merges with --ignore-ancestry or diff | patch can go anywhere. The mergeinfo in HEAD is in a bad state from years of neglect and manual tampering and this was branched into 10.x. This confuses the coalescing code and prevents it from doing its job. Approved by: re (gjb, implicit) -- Bob Willcox | (1) If it's green or it wiggles, it's biology. bob@immure.com | (2) If it stinks, it's chemistry. Austin, TX | (3) If it doesn't work, it's physics.