From owner-freebsd-stable@FreeBSD.ORG  Wed Jan 29 18:36:16 2014
Return-Path: <owner-freebsd-stable@FreeBSD.ORG>
Delivered-To: freebsd-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 EB8D4BFE;
 Wed, 29 Jan 2014 18:36:16 +0000 (UTC)
Received: from bigwig.baldwin.cx (bigwig.baldwin.cx [IPv6:2001:470:1f11:75::1])
 (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
 (No client certificate requested)
 by mx1.freebsd.org (Postfix) with ESMTPS id BA07C1811;
 Wed, 29 Jan 2014 18:36:16 +0000 (UTC)
Received: from jhbbsd.localnet (unknown [209.249.190.124])
 by bigwig.baldwin.cx (Postfix) with ESMTPSA id 86BF3B9C8;
 Wed, 29 Jan 2014 13:36:15 -0500 (EST)
From: John Baldwin <jhb@freebsd.org>
To: Yamagi Burmeister <lists@yamagi.org>
Subject: Re: 10.0, csh history merge broken?
Date: Wed, 29 Jan 2014 12:14:56 -0500
User-Agent: KMail/1.13.5 (FreeBSD/8.4-CBSD-20130906; KDE/4.5.5; amd64; ; )
References: <52E0E917.3060403@li.ru> <201401281147.15801.jhb@freebsd.org>
 <20140129090624.615af8881fe6df55c9663b5c@yamagi.org>
In-Reply-To: <20140129090624.615af8881fe6df55c9663b5c@yamagi.org>
MIME-Version: 1.0
Content-Type: Text/Plain;
  charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Message-Id: <201401291214.56887.jhb@freebsd.org>
X-Greylist: Sender succeeded SMTP AUTH, not delayed by milter-greylist-4.2.7
 (bigwig.baldwin.cx); Wed, 29 Jan 2014 13:36:15 -0500 (EST)
Cc: stable@freebsd.org, yerenkow@gmail.com, freebsd-stable@freebsd.org,
 amarat@li.ru
X-BeenThere: freebsd-stable@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: Production branch of FreeBSD source code <freebsd-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-stable/>
List-Post: <mailto:freebsd-stable@freebsd.org>
List-Help: <mailto:freebsd-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-stable>,
 <mailto:freebsd-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 29 Jan 2014 18:36:17 -0000

On Wednesday, January 29, 2014 3:06:24 am Yamagi Burmeister wrote:
> On Tue, 28 Jan 2014 11:47:15 -0500
> John Baldwin <jhb@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@. 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