From owner-cvs-all@FreeBSD.ORG Mon May 12 22:10:20 2008 Return-Path: Delivered-To: cvs-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F2D64106567B; Mon, 12 May 2008 22:10:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from elvis.mu.org (elvis.mu.org [192.203.228.196]) by mx1.freebsd.org (Postfix) with ESMTP id D5BFD8FC27; Mon, 12 May 2008 22:10:19 +0000 (UTC) (envelope-from jhb@freebsd.org) Received: from server.baldwin.cx (unknown [208.65.91.234]) by elvis.mu.org (Postfix) with ESMTP id 566941A4D83; Mon, 12 May 2008 15:10:19 -0700 (PDT) Received: from localhost.corp.yahoo.com (john@localhost [127.0.0.1]) (authenticated bits=0) by server.baldwin.cx (8.14.2/8.14.2) with ESMTP id m4CMABrT052835; Mon, 12 May 2008 18:10:15 -0400 (EDT) (envelope-from jhb@freebsd.org) From: John Baldwin To: obrien@freebsd.org Date: Mon, 12 May 2008 18:09:55 -0400 User-Agent: KMail/1.9.7 References: <200803191447.m2JEl3xx027666@repoman.freebsd.org> <200805061433.27897.jhb@freebsd.org> <20080511203047.GA58310@dragon.NUXI.org> In-Reply-To: <20080511203047.GA58310@dragon.NUXI.org> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200805121809.55788.jhb@freebsd.org> X-Greylist: Sender succeeded SMTP AUTH authentication, not delayed by milter-greylist-2.0.2 (server.baldwin.cx [127.0.0.1]); Mon, 12 May 2008 18:10:15 -0400 (EDT) X-Virus-Scanned: ClamAV 0.91.2/7105/Mon May 12 16:14:20 2008 on server.baldwin.cx X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=4.2 tests=ALL_TRUSTED,AWL,BAYES_00 autolearn=ham version=3.1.3 X-Spam-Checker-Version: SpamAssassin 3.1.3 (2006-06-01) on server.baldwin.cx Cc: cvs-src@freebsd.org, src-committers@freebsd.org, cvs-all@freebsd.org Subject: Re: cvs commit: src/contrib/cvs - Imported sources X-BeenThere: cvs-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: CVS commit messages for the entire tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 12 May 2008 22:10:20 -0000 On Sunday 11 May 2008 04:30:47 pm David O'Brien wrote: > On Tue, May 06, 2008 at 02:33:27PM -0400, John Baldwin wrote: > > On Wednesday 19 March 2008 10:47:03 am David E. O'Brien wrote: > > > obrien 2008-03-19 14:47:03 UTC > > > > > > FreeBSD src repository > > > > > > src/contrib/cvs - Imported sources > > > Update of /home/ncvs/src/contrib/cvs > > > In directory repoman.freebsd.org:/tmp/cvs-serv25516 > > > > > > Log Message: > > > Import of 1.11 branch snapshot - using the 10-March-2008 code base. > > > > > > Status: > > > > > > Vendor Tag: CVSHOME > > > Release Tags: v1_11_20080310 > > > > Please consider reverting this. There have been lots of reports of CVS > > breakage after these changes. The latest I ran into today is that 'cvs > > update -C' doesn't work anymore. > > Typically we would first try to fix problems before just reverting. > Please give me more information on how to experience this. cvs(1) is a very critical tool and it isn't clear that the recent upgrades have provided any improvements to justify changing it. % cvs up -r1.137 ObsoleteFiles.inc - edit ObsoleteFiles.inc and create an intentional conflict with 1.138: % cvs diff -u ObsoleteFiles.inc Index: ObsoleteFiles.inc =================================================================== RCS file: /usr/cvs/src/ObsoleteFiles.inc,v retrieving revision 1.137 diff -u -r1.137 ObsoleteFiles.inc --- ObsoleteFiles.inc 20 Apr 2008 16:03:19 -0000 1.137 +++ ObsoleteFiles.inc 12 May 2008 22:08:20 -0000 @@ -35,6 +35,7 @@ OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz +XXXX # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal > cvs up -A ObsoleteFiles.inc RCS file: /usr/cvs/src/ObsoleteFiles.inc,v retrieving revision 1.137 retrieving revision 1.138 Merging differences between 1.137 and 1.138 into ObsoleteFiles.inc rcsmerge: warning: conflicts during merge cvs update: conflicts found in ObsoleteFiles.inc C ObsoleteFiles.inc % cvs up -C ObsoleteFiles.inc C ObsoleteFiles.inc % cvs diff -u ObsoleteFiles.inc Index: ObsoleteFiles.inc =================================================================== RCS file: /usr/cvs/src/ObsoleteFiles.inc,v retrieving revision 1.138 diff -u -r1.138 ObsoleteFiles.inc --- ObsoleteFiles.inc 10 May 2008 18:43:22 -0000 1.138 +++ ObsoleteFiles.inc 12 May 2008 22:08:46 -0000 @@ -40,10 +40,14 @@ OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz +<<<<<<< ObsoleteFiles.inc +XXXX +======= .if ${TARGET_ARCH} == "amd64" OLD_FILES+=usr/lib32/libkse.so OLD_LIBS+=usr/lib32/libkse.so.3 .endif +>>>>>>> 1.138 # 20080220: geom_lvm rename to geom_linux_lvm OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz # 20080126: oldcard.4 removal -- John Baldwin