cvs commit: src/contrib/cvs - Imported sources

[John Baldwin]

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