10.0, csh history merge broken?

[John Baldwin]

On Wednesday, January 29, 2014 3:06:24 am Yamagi Burmeister wrote:
> On Tue, 28 Jan 2014 11:47:15 -0500
> John Baldwin <jhb at freebsd.org> wrote:
> 
> > On Monday, January 27, 2014 3:55:53 am Alexander Yerenkow wrote:
> > >  >Maybe it would be a good idea to cherry pick those two revisions and
> > >  >merge then into FreeBSD, until a new tcsh version is released.
> > > 
> > > I think this is must, since currently any regular shutdown can break 
login
> > > ability (if server is high loaded + history file is broken and big 
enough).
> > > I have now locked history file with chflags until fix will come.
> > 
> > These changes are already present in HEAD (FreeBSD 11) and will probably
> > be merged by the next 10 release.
> 
> Really? As far as I can see the last commit to head/contrib/tcsh was
> the update to 6.18.01 one 22/02/2012 by mp at . While 6.18.01 featured a
> new, much faster history merge logic which minimized the race window,
> the root cause wasn't solve. Only the two upstream commits (from
> 08/12/2013 and 11/12/2013) linked above brought real locking to the
> merge process, serializing it between several tcsh instances. 

Bah, somehow I had thought I had seen the 'lock' keyword in tcsh on my
HEAD box, but I don't see it there now.

-- 
John Baldwin