Date: Mon, 31 Mar 2008 19:55:37 -0700 From: Xin LI <delphij@delphij.net> To: obrien@freebsd.org, d@delphij.net, FreeBSD Current <freebsd-current@freebsd.org> Subject: Re: cvs: something wrong wrt vendor branch behavior Message-ID: <47F1A429.6040902@delphij.net> In-Reply-To: <20080401024607.GD66987@dragon.NUXI.org> References: <47F0707F.3080009@delphij.net> <20080401024607.GD66987@dragon.NUXI.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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 <delphij@delphij.net> http://www.delphij.net/
FreeBSD - The Power to Serve!
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?47F1A429.6040902>