Date: Sun, 9 Mar 2014 22:14:49 -0500 From: Bob Willcox <bob@immure.com> To: Zhihao Yuan <zy@miator.net> Cc: FreeBSD Stable ML <stable@freebsd.org> Subject: Re: vi loop when resizing window Message-ID: <20140310031449.GE2665@rancor.immure.com> In-Reply-To: <CAGsORuAY4gs8yPaTAJ6WnvTL%2BjQg%2B-Vj8XQdy2GHbStm2VCrsw@mail.gmail.com> References: <20140308162614.GC94968@rancor.immure.com> <20140308171824.GA31887@spectrum.skysmurf.nl> <20140308172501.GH1626@albert.catwhisker.org> <20140308214410.GC2665@rancor.immure.com> <CAGsORuAY4gs8yPaTAJ6WnvTL%2BjQg%2B-Vj8XQdy2GHbStm2VCrsw@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sun, Mar 09, 2014 at 01:03:13PM -0400, Zhihao Yuan wrote: > On Sat, Mar 8, 2014 at 4:44 PM, Bob Willcox <bob@immure.com> 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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20140310031449.GE2665>