Date: Tue, 06 Feb 2001 02:23:26 -0700 From: Warner Losh <imp@harmony.village.org> To: obrien@FreeBSD.org Cc: Garance A Drosihn <drosih@rpi.edu>, John Baldwin <jhb@FreeBSD.org>, Archie Cobbs <archie@dellroad.org>, cvs-all@FreeBSD.org, cvs-committers@FreeBSD.org, Kris Kennaway <kris@FreeBSD.org> Subject: Re: cvs commit: src/contrib/tcpdump print-smb.c Message-ID: <200102060923.f169NQ981843@harmony.village.org> In-Reply-To: Your message of "Tue, 06 Feb 2001 01:09:03 PST." <20010206010903.E33865@dragon.nuxi.com> References: <20010206010903.E33865@dragon.nuxi.com> <p05010402b694bfca2ece@[128.113.24.161]> <XFMail.010123221817.jhb@FreeBSD.org> <p05010402b694bfca2ece@[128.113.24.161]> <200101242056.f0OKut961097@harmony.village.org>
next in thread | previous in thread | raw e-mail | index | archive | help
In message <20010206010903.E33865@dragon.nuxi.com> "David O'Brien" writes: : Actually CVS does allow one to return to the vendor branch even after a : file has been pulled off of it. The problem is Peter will not use this : feature has he found problems with ``cvs diff -D ...'' after doing it. : But I really do wonder if Peter just didn't experience the major -D bug in : 1.10.7 that makes its usage in branches totally useless. It doesn't record default beanch change meta information that I can see, so how could -D work. : > One could argue that you could change the default branch when this : > happens. However, that breaks cvs update -D, which is considered a : > worse breakage than the repo-bloat. : : Are you sure it breaks it when using CVS 1.11.0? `update -D" is very : broken in 1.10.7. Just try checking out a pre-4.0 -CURRENT using 1.10.7. I've not tried it with 1.11.0 yet. It has its own set of problems (I get a cvs server or two running away on my main machine from time to time eating all the cpu time). And 1.11 and 1.10.7 have interoperability issues (I get lots of conflicts for files being in the way when someone modifies the files if I cross thread versions at work). Warner To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe cvs-all" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200102060923.f169NQ981843>