From owner-freebsd-current@FreeBSD.ORG Tue Apr 1 02:55:47 2008 Return-Path: Delivered-To: freebsd-current@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B951E106564A; Tue, 1 Apr 2008 02:55:47 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.delphij.net (delphij-pt.tunnel.tserv2.fmt.ipv6.he.net [IPv6:2001:470:1f03:2c9::2]) by mx1.freebsd.org (Postfix) with ESMTP id 5FBCE8FC25; Tue, 1 Apr 2008 02:55:47 +0000 (UTC) (envelope-from delphij@delphij.net) Received: from tarsier.geekcn.org (tarsier.geekcn.org [202.108.54.204]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by tarsier.delphij.net (Postfix) with ESMTPS id 51A8028450; Tue, 1 Apr 2008 10:55:46 +0800 (CST) Received: from localhost (tarsier.geekcn.org [202.108.54.204]) by tarsier.geekcn.org (Postfix) with ESMTP id CDDF4EB9386; Tue, 1 Apr 2008 10:55:45 +0800 (CST) X-Virus-Scanned: amavisd-new at geekcn.org Received: from tarsier.geekcn.org ([202.108.54.204]) by localhost (mail.geekcn.org [202.108.54.204]) (amavisd-new, port 10024) with ESMTP id O6vTItVmmldg; Tue, 1 Apr 2008 10:55:40 +0800 (CST) Received: from charlie.delphij.net (71.5.7.139.ptr.us.xo.net [71.5.7.139]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by tarsier.geekcn.org (Postfix) with ESMTPSA id B11DBEB92A2; Tue, 1 Apr 2008 10:55:39 +0800 (CST) DomainKey-Signature: a=rsa-sha1; s=default; d=delphij.net; c=nofws; q=dns; h=message-id:date:from:reply-to:organization:user-agent: mime-version:to:subject:references:in-reply-to:x-enigmail-version:openpgp: content-type:content-transfer-encoding; b=P6QEBY/9XxzUiahsGabllDF/RkstZ391yXwochHEwQXYFOrlRksBZQgtOOC46/QAj AeQBaa3dihdG+IQmqwP/g== Message-ID: <47F1A429.6040902@delphij.net> Date: Mon, 31 Mar 2008 19:55:37 -0700 From: Xin LI Organization: The FreeBSD Project User-Agent: Thunderbird 2.0.0.12 (X11/20080312) MIME-Version: 1.0 To: obrien@freebsd.org, d@delphij.net, FreeBSD Current References: <47F0707F.3080009@delphij.net> <20080401024607.GD66987@dragon.NUXI.org> In-Reply-To: <20080401024607.GD66987@dragon.NUXI.org> X-Enigmail-Version: 0.95.6 OpenPGP: id=18EDEBA0; url=http://www.delphij.net/delphij.asc Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Cc: Subject: Re: cvs: something wrong wrt vendor branch behavior X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: d@delphij.net List-Id: Discussions about the use of FreeBSD-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Apr 2008 02:55:47 -0000 David O'Brien wrote: > On Sun, Mar 30, 2008 at 10:02:55PM -0700, Xin LI wrote: >> It seems that the recent cvs import has caused it to confuse the state >> of files. Continously execute the same command would always spit >> something like this: >> >> [delphij@charlie] /usr/src/contrib> cvs -qR up -PdA >> U ipfilter/BSD/ipfadm-rcd >> U ipfilter/lib/alist_free.c >> U ipfilter/lib/alist_new.c >> U ipfilter/lib/load_file.c >> U ipfilter/lib/load_http.c >> U ipfilter/lib/load_url.c >> >> My understainding is that 'U something' is only displayed when the file >> is either updated, or created in the repository? > > I saw this same weirdness today with "-PdA -r RELENG_6" also. I wonder > if 'U' is printed out when the branch is changing now - even if the > file(s) don't. I think that it's not printed if file revision was not changed, but it would appear if the file revision has been changed (i.e. after a MFC). Still don't understand why it appear in -A case. Running cvs up -A on the said file will always say 'U' which does not seems to be reasonable: [delphij@charlie] /usr/src/contrib> cvs -qR up ipfilter/BSD/ipfadm-rcd [delphij@charlie] /usr/src/contrib> cvs -qR up -A ipfilter/BSD/ipfadm-rcd U ipfilter/BSD/ipfadm-rcd [delphij@charlie] /usr/src/contrib> cvs -qR up -A ipfilter/BSD/ipfadm-rcd U ipfilter/BSD/ipfadm-rcd [delphij@charlie] /usr/src/contrib> cvs -qR status ipfilter/BSD/ipfadm-rcd =================================================================== File: ipfadm-rcd Status: Up-to-date Working revision: 1.1.1.1 Tue Apr 1 02:53:58 2008 Repository revision: 1.1.1.1 /home/ncvs/src/contrib/ipfilter/BSD/ipfadm-rcd,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: -kk Sound like that the vendor HEAD is not considered as HEAD when the revision is 1.1.1.1 and no actual HEAD? Cheers, -- Xin LI http://www.delphij.net/ FreeBSD - The Power to Serve!