From owner-freebsd-current@FreeBSD.ORG  Thu Oct 21 23:10:19 2004
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 2055916A4CE; Thu, 21 Oct 2004 23:10:19 +0000 (GMT)
Received: from nagual.pp.ru (pobrecita.freebsd.ru [194.87.13.42])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 6804343D45; Thu, 21 Oct 2004 23:10:18 +0000 (GMT)
	(envelope-from ache@pobrecita.freebsd.ru)
Received: from pobrecita.freebsd.ru (ache@localhost [127.0.0.1])
	by nagual.pp.ru (8.13.1/8.13.1) with ESMTP id i9LNAGLs080503;
	Fri, 22 Oct 2004 03:10:16 +0400 (MSD)
	(envelope-from ache@pobrecita.freebsd.ru)
Received: (from ache@localhost)
	by pobrecita.freebsd.ru (8.13.1/8.13.1/Submit) id i9LNAFRK080502;
	Fri, 22 Oct 2004 03:10:16 +0400 (MSD)
	(envelope-from ache)
Date: Fri, 22 Oct 2004 03:10:13 +0400
From: Andrey Chernov <ache@nagual.pp.ru>
To: "David O'Brien" <obrien@FreeBSD.ORG>
Message-ID: <20041021231013.GA79336@nagual.pp.ru>
Mail-Followup-To: Andrey Chernov <ache@nagual.pp.ru>,
	David O'Brien <obrien@FreeBSD.ORG>, Ian FREISLICH <if@hetzner.co.za>,
	freebsd-current@FreeBSD.ORG
References: <20041021085653.GA67949@nagual.pp.ru>
	<E1CKZ63-000PGP-00@hetzner.co.za> <20041021093306.GA68546@nagual.pp.ru>
	<20041021190115.GC37500@dragon.nuxi.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20041021190115.GC37500@dragon.nuxi.com>
User-Agent: Mutt/1.5.6i
X-AntiVirus: checked by AntiVir Milter (version: 1.1; AVE: 6.28.0.7;
	VDF: 6.28.0.30; host: pobrecita.freebsd.ru)
cc: Ian FREISLICH <if@hetzner.co.za>
cc: freebsd-current@FreeBSD.ORG
Subject: Re: [PATCH] libreadline buildworld breakage.
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
	<freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
	<mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 21 Oct 2004 23:10:19 -0000

On Thu, Oct 21, 2004 at 12:01:15PM -0700, David O'Brien wrote:
> What are you talking about??  src/contrib/libreadline/complete is off the
> vendor branch.  After you import a new version of libreadline you have to
> make a commit to HEAD to make the new version of
> src/contrib/libreadline/complete.c show up.  Unless you commit *EXACTLY*
> rev 1.1.1.9 to HEAD (which would be rev 1.10) without any change; rev
> 1.10 should have a $FreeBSD$.

1) complete.c is not shown in conflics while importing (you can check 
commit message).
2) "cvs co contrib_libradline" extracts v1.1.1.9 and NOT v1.9
3) cvsup sends 1.1.1.9 diffs and NOT leave v1.9 inplace.

After my import I commit only files for which conflicts are shown (which 
is readline.h alone).

Maybe you are right but something wrong happens inside, beyound of my 
knowledge.

-- 
Andrey Chernov | http://ache.pp.ru/