From owner-freebsd-current@FreeBSD.ORG Fri Oct 22 00:19:07 2004 Return-Path: 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 D671516A4CE; Fri, 22 Oct 2004 00:19:07 +0000 (GMT) Received: from kane.otenet.gr (kane.otenet.gr [195.170.0.27]) by mx1.FreeBSD.org (Postfix) with ESMTP id 25B4143D54; Fri, 22 Oct 2004 00:19:07 +0000 (GMT) (envelope-from keramida@freebsd.org) Received: from gothmog.gr (patr530-a106.otenet.gr [212.205.215.106]) i9M0J2Ds003935; Fri, 22 Oct 2004 03:19:03 +0300 Received: from gothmog.gr (gothmog [127.0.0.1]) by gothmog.gr (8.13.1/8.13.1) with ESMTP id i9M0J0VA023557; Fri, 22 Oct 2004 03:19:00 +0300 (EEST) (envelope-from keramida@freebsd.org) Received: (from giorgos@localhost) by gothmog.gr (8.13.1/8.13.1/Submit) id i9M0J0bB023556; Fri, 22 Oct 2004 03:19:00 +0300 (EEST) (envelope-from keramida@freebsd.org) Date: Fri, 22 Oct 2004 03:18:59 +0300 From: Giorgos Keramidas To: Andrey Chernov , "David O'Brien" , Ian FREISLICH , freebsd-current@freebsd.org Message-ID: <20041022001859.GA22896@gothmog.gr> References: <20041021085653.GA67949@nagual.pp.ru> <20041021093306.GA68546@nagual.pp.ru> <20041021190115.GC37500@dragon.nuxi.com> <20041021231013.GA79336@nagual.pp.ru> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20041021231013.GA79336@nagual.pp.ru> 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Oct 2004 00:19:08 -0000 On 2004-10-22 03:10, Andrey Chernov wrote: > 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. Step 2) seems weird. It's probably because of the `branch: 1.1.1;' line in the RCS header of the complete.c,v file. Has this been added manually to force complete.c back into the vendor branch? > 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. When a file is already off the vendor branch and you do an import that modifies it, a conflict might not show up but a cvs update -j VENDOR and a subsequent commit might still be required to pull up changes from the vendor branch into HEAD. Some of those changes might not conflict with earlier HEAD changes. A local RCS id line like $FreeBSD$ will not necessarily conflict with vendor changes, if they are more than a few lines apart. I think this is what David was referring to. - Giorgos