vi loop when resizing window

[Bob Willcox]

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 at 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 at immure.com | (2)     If it stinks, it's chemistry.
Austin, TX     | (3)     If it doesn't work, it's physics.