bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

CVS 1.11 builds under QNX Neutrino 6.20, but fails "binfiles-6" test


From: John Nagle
Subject: CVS 1.11 builds under QNX Neutrino 6.20, but fails "binfiles-6" test
Date: Mon, 16 Dec 2002 20:44:35 -0800
User-agent: Mozilla/5.0 (Photon; U; QNX x86pc; en-US; rv:0.9.8) Gecko/20020418

    The documentation suggests building CVS under other operating
systems and reporting the results.  I thus built CVS under QNX
Neutrino 6.20 (the free version) on x86, with the following results.

Build worked fine.  I simply did

./configure
make

and the make ran successfully, with no error messages.

Then I tried "make check". That ran for about ten minutes, then
produced this output:

/bin/sh ./sanity.sh `pwd`/cvs
This test should produce no other output than this line, and a final "OK".
FAIL: binfiles-6
make[1]: *** [check] Error 1
make[1]: Leaving directory `/home/nagle/cvsclient/cvs-1.11/src'
make: *** [check] Error 2

check.log is attached, so you can see the whole test process.

So it almost works on QNX. It's really close. Will this get fixed?
Thanks.

                                       John Nagle
                                       Animats
PASS: 1
PASS: 1a
PASS: basica-0a
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: basica-0b
PASS: basica-1
PASS: basica-1a0
PASS: basica-1a1
PASS: basica-1a2
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir added to the repository
PASS: basica-1a10
PASS: basica-1a11
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir added to the repository
PASS: basica-2
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir added to the repository
PASS: basica-3
cvs commit: nothing known about `ssfile'
cvs [commit aborted]: correct above errors first!
PASS: basica-notadded
cvs add: scheduling file `ssfile' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: basica-4
cvs tag: nothing known about ssfile
cvs [tag aborted]: correct the above errors first!
PASS: basica-4a
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
done
Checking in sdir/ssdir/ssfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v  <--  ssfile
initial revision: 1.1
done
PASS: basica-5
cvs tag: Attempt to add reserved tag name BASE
cvs [tag aborted]: failed to set tag BASE to revision 1.1 in 
/tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
PASS: basica-5a
T sdir/ssdir/ssfile
PASS: basica-5b
PASS: basica-6
Index: sdir/ssdir/ssfile
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
retrieving revision 1.1
diff -c -r1.1 ssfile
*** sdir/ssdir/ssfile   2002/12/17 04:02:48     1.1
--- sdir/ssdir/ssfile   2002/12/17 04:02:49
***************
*** 1 ****
--- 1,2 ----
  ssfile
+ ssfile line 2
PASS: basica-6.2
Index: sdir/ssdir/ssfile
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
retrieving revision 1.1
diff -c -r1.1 ssfile
*** sdir/ssdir/ssfile   2002/12/17 04:02:48     1.1
--- sdir/ssdir/ssfile   2002/12/17 04:02:49
***************
*** 1 ****
--- 1,2 ----
  ssfile
+ ssfile line 2
PASS: basica-6.3
Checking in sdir/ssdir/ssfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v  <--  ssfile
new revision: 1.2; previous revision: 1.1
done
PASS: basica-7
cvs commit: nothing known about `nonexist'
cvs [commit aborted]: correct above errors first!
PASS: basica-nonexist
PASS: basica-8
PASS: basica-8a0
Checking in ssfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v  <--  ssfile
new revision: 1.3; previous revision: 1.2
done
PASS: basica-8a
Checking in ssfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v  <--  ssfile
new revision: 2.0; previous revision: 1.3
done
PASS: basica-8a1
Checking in ssfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v  <--  ssfile
new revision: 3.1; previous revision: 2.0
done
PASS: basica-8a2
Checking in ssfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v  <--  ssfile
cvs commit: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v: can't find 
branch point 3.0
cvs commit: could not check in ssfile
PASS: basica-8a3
Checking in ssfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v  <--  ssfile
new revision: 3.1.2.1; previous revision: 3.1
done
PASS: basica-8a4
U ssfile
PASS: basica-8a5
Index: sdir/ssdir/ssfile
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
retrieving revision 1.2
retrieving revision 1.3
diff -r1.2 -r1.3
PASS: basica-8b
Index: sdir/ssdir/ssfile
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
retrieving revision 1.2
retrieving revision 1.3
diff -C3isacrowd -r1.2 -r1.3
cvs diff: invalid context length argument
PASS: basica-8b1
cvs [update aborted]: /tmp/cvs-sanity/nonexist/CVSROOT: No such file or 
directory
PASS: basica-9
Annotations for sdir/ssdir/ssfile
***************
1.1          (nagle    17-Dec-02): ssfile
1.2          (nagle    17-Dec-02): ssfile line 2
PASS: basica-10
cvs admin: while processing more than one file:
cvs [admin aborted]: attempt to specify a numeric revision
PASS: basica-o1
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
done
PASS: basica-o2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
done
PASS: basica-o2a
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
cvs admin: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v: Revision 
NOT_EXIST doesn't exist.
cvs admin: cannot modify RCS file for `ssfile'
PASS: basica-o2b
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
done
PASS: basica-o3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
done
PASS: basica-o4
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
done
PASS: basica-o5
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
deleting revision 2.0
deleting revision 1.3
done
PASS: basica-o5a
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
deleting revision 2.0
deleting revision 1.3
done
PASS: basica-o6
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
deleting revision 3.1.2.1
done
PASS: basica-o6a

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/ssdir/ssfile,v
Working file: ssfile
head: 3.1
branch:
locks: strict
access list:
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 3.1
date: 2002/12/17 04:02:53;  author: nagle;  state: Exp;  lines: +0 -0
bump-it
----------------------------
revision 1.2
date: 2002/12/17 04:02:49;  author: nagle;  state: Exp;  lines: +1 -0
modify-it
----------------------------
revision 1.1
date: 2002/12/17 04:02:48;  author: nagle;  state: Exp;
add-it
=============================================================================
PASS: basica-o7
ssfile
PASS: basica-o8
PASS: basicb-0a
cvs add: scheduling file `topfile' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: basicb-0b
RCS file: /tmp/cvs-sanity/cvsroot/topfile,v
done
Checking in topfile;
/tmp/cvs-sanity/cvsroot/topfile,v  <--  topfile
initial revision: 1.1
done
PASS: basicb-0c
U topfile
PASS: basicb-0d
PASS: basicb-0d0
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: basicb-0e
PASS: basicb-1
PASS: basicb-1a
first-dir
PASS: basicb-1c
Directory /tmp/cvs-sanity/cvsroot/first-dir/Emptydir added to the repository
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir2 added to the repository
PASS: basicb-2
cvs add: scheduling file `sfile1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: basicb-2a10
cvs status: use `cvs add' to create an entry for sfile1
===================================================================
File: sfile1            Status: Unknown

   Working revision:    No entry for sfile1
   Repository revision: No revision control file

PASS: basicb-2a11
cvs add: scheduling file `sfile1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: basicb-3
===================================================================
File: sfile1            Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: basicb-3a1
cvs add: scheduling file `sfile2' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: basicb-4
cvs commit: warning: directory CVS specified in argument
cvs commit: but CVS uses CVS for its own purposes; skipping CVS directory
PASS: basicb-4a
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Emptydir/sfile1,v
done
Checking in Emptydir/sfile1;
/tmp/cvs-sanity/cvsroot/first-dir/Emptydir/sfile1,v  <--  sfile1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir2/sfile2,v
done
Checking in sdir2/sfile2;
/tmp/cvs-sanity/cvsroot/first-dir/sdir2/sfile2,v  <--  sfile2
initial revision: 1.1
done
PASS: basicb-5
Checking in Emptydir/sfile1;
/tmp/cvs-sanity/cvsroot/first-dir/Emptydir/sfile1,v  <--  sfile1
new revision: 1.2; previous revision: 1.1
done
PASS: basicb-6
T Emptydir/sfile1
T sdir2/sfile2
PASS: basicb-7
Checking in sdir2/sfile2;
/tmp/cvs-sanity/cvsroot/first-dir/sdir2/sfile2,v  <--  sfile2
new revision: 1.2; previous revision: 1.1
done
PASS: basicb-8
U first-dir1/Emptydir/sfile1
U first-dir1/sdir2/sfile2
PASS: basicb-cod-1
U newdir/first-dir/Emptydir/sfile1
U newdir/first-dir/sdir2/sfile2
PASS: basicb-9
PASS: basicb-9a
.
PASS: basicb-9c
first-dir
PASS: basicb-9d
first-dir/Emptydir
PASS: basicb-9e
first-dir/sdir2
PASS: basicb-9f
sfile1 develops
sfile2 starts
PASS: basicb-10
U topfile
PASS: basicb-14
Directory /tmp/cvs-sanity/cvsroot/second-dir added to the repository
PASS: basicb-15
cvs add: scheduling file `aa' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: basicb-16
RCS file: /tmp/cvs-sanity/cvsroot/second-dir/aa,v
done
Checking in aa;
/tmp/cvs-sanity/cvsroot/second-dir/aa,v  <--  aa
initial revision: 1.1
done
PASS: basicb-17
RCS file: /tmp/cvs-sanity/cvsroot/topfile,v
deleting revision 1.1
cvs [admin aborted]: attempt to delete all revisions
PASS: basicb-o1
U first-dir/Emptydir/sfile1
U first-dir/sdir2/sfile2
PASS: basicb-o2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir2/sfile2,v
deleting revision 1.2
deleting revision 1.1
cvs [admin aborted]: attempt to delete all revisions
PASS: basicb-o3
admin: invalid option -- H
cvs [admin aborted]: specify cvs -H admin for usage information
PASS: basicb-21
cvs diff: in directory .:
cvs [diff aborted]: there is no version here; run 'cvs checkout' first
PASS: basicc-1
PASS: basicc-2
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
Directory /tmp/cvs-sanity/cvsroot/second-dir added to the repository
PASS: basicc-3
first-dir second-dir
PASS: basicc-4
cvs update: Updating first-dir
cvs update: Updating second-dir
PASS: basicc-5
PASS: basicc-6
PASS: basicc-7
cvs release: deletion of directory . failed: Invalid argument
PASS: basicc-8
PASS: basicc-9
cvs release: deletion of directory ./. failed: Invalid argument
PASS: basicc-11
PASS: basicc-11a
PASS: basicc-12
CVS CVSROOT first-dir second-dir
PASS: basicc-13
PASS: basicc-14
PASS: basicc-15
CVS CVSROOT
PASS: basicc-16
PASS: basic1-1
cvs add: scheduling file `file2' for addition
cvs add: scheduling file `file3' for addition
cvs add: scheduling file `file4' for addition
cvs add: scheduling file `file5' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: basic1-14-add-add
A file2
A file3
A file4
A file5
PASS: basic1-15-add-add
A file2
A file3
A file4
A file5
PASS: basic1-16-add-add
===================================================================
File: file2             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file3             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file4             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file5             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: basic1-17-add-add
cvs log: file2 has been added, but not committed
cvs log: file3 has been added, but not committed
cvs log: file4 has been added, but not committed
cvs log: file5 has been added, but not committed
PASS: basic1-18-add-add
A first-dir/file2
A first-dir/file3
A first-dir/file4
A first-dir/file5
PASS: basic1-21-add-add
cvs log: Logging first-dir
cvs log: file2 has been added, but not committed
cvs log: file3 has been added, but not committed
cvs log: file4 has been added, but not committed
cvs log: file5 has been added, but not committed
PASS: basic1-22-add-add
cvs status: Examining first-dir
===================================================================
File: file2             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file3             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file4             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file5             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: basic1-23-add-add
cvs update: Updating first-dir
A first-dir/file2
A first-dir/file3
A first-dir/file4
A first-dir/file5
PASS: basic1-24-add-add
cvs checkout: Updating first-dir
A first-dir/file2
A first-dir/file3
A first-dir/file4
A first-dir/file5
PASS: basic1-27-add-add
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file3,v
done
Checking in file3;
/tmp/cvs-sanity/cvsroot/first-dir/file3,v  <--  file3
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file5,v
done
Checking in file5;
/tmp/cvs-sanity/cvsroot/first-dir/file5,v  <--  file5
initial revision: 1.1
done
PASS: basic1-14-add-ci
PASS: basic1-15-add-ci
PASS: basic1-16-add-ci
===================================================================
File: file2             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file2,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file3             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file3,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file4             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file4,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file5             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file5,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: basic1-17-add-ci

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
Working file: file2
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file3,v
Working file: file3
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
Working file: file4
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file5,v
Working file: file5
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================
PASS: basic1-18-add-ci
PASS: basic1-21-add-ci

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
Working file: first-dir/file2
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file3,v
Working file: first-dir/file3
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
Working file: first-dir/file4
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file5,v
Working file: first-dir/file5
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================
PASS: basic1-22-add-ci
===================================================================
File: file2             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file2,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file3             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file3,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file4             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file4,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file5             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file5,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: basic1-23-add-ci
PASS: basic1-24-add-ci
PASS: basic1-27-add-ci
cvs remove: scheduling `file2' for removal
cvs remove: scheduling `file3' for removal
cvs remove: scheduling `file4' for removal
cvs remove: scheduling `file5' for removal
cvs remove: use 'cvs commit' to remove these files permanently
PASS: basic1-14-rm-rm
R file2
R file3
R file4
R file5
PASS: basic1-15-rm-rm
R file2
R file3
R file4
R file5
PASS: basic1-16-rm-rm
===================================================================
File: no file file2             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file2,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: no file file3             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file3,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: no file file4             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file4,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: no file file5             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file5,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: basic1-17-rm-rm

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
Working file: file2
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file3,v
Working file: file3
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
Working file: file4
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file5,v
Working file: file5
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================
PASS: basic1-18-rm-rm
R first-dir/file2
R first-dir/file3
R first-dir/file4
R first-dir/file5
PASS: basic1-21-rm-rm

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
Working file: first-dir/file2
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file3,v
Working file: first-dir/file3
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
Working file: first-dir/file4
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file5,v
Working file: first-dir/file5
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================
PASS: basic1-22-rm-rm
===================================================================
File: no file file2             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file2,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: no file file3             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file3,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: no file file4             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file4,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: no file file5             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:17 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file5,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: basic1-23-rm-rm
R first-dir/file2
R first-dir/file3
R first-dir/file4
R first-dir/file5
PASS: basic1-24-rm-rm
R first-dir/file2
R first-dir/file3
R first-dir/file4
R first-dir/file5
PASS: basic1-27-rm-rm
Removing file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: delete; previous revision: 1.1
done
Removing file3;
/tmp/cvs-sanity/cvsroot/first-dir/file3,v  <--  file3
new revision: delete; previous revision: 1.1
done
Removing file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: delete; previous revision: 1.1
done
Removing file5;
/tmp/cvs-sanity/cvsroot/first-dir/file5,v  <--  file5
new revision: delete; previous revision: 1.1
done
PASS: basic1-14-rm-ci
PASS: basic1-15-rm-ci
PASS: basic1-16-rm-ci
PASS: basic1-17-rm-ci

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file2,v
Working file: file2
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/12/17 04:03:24;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v
Working file: file3
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/12/17 04:03:24;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file4,v
Working file: file4
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/12/17 04:03:24;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file5,v
Working file: file5
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/12/17 04:03:24;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================
PASS: basic1-18-rm-ci
PASS: basic1-21-rm-ci

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file2,v
Working file: first-dir/file2
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/12/17 04:03:24;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v
Working file: first-dir/file3
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/12/17 04:03:24;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file4,v
Working file: first-dir/file4
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/12/17 04:03:24;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file5,v
Working file: first-dir/file5
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2002/12/17 04:03:24;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:03:18;  author: nagle;  state: Exp;
test
=============================================================================
PASS: basic1-22-rm-ci
PASS: basic1-23-rm-ci
PASS: basic1-24-rm-ci
PASS: basic1-27-rm-ci
PASS: basic1-28
PASS: deep-1
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1 added to the repository
PASS: deep-2-dir1
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: deep-3-dir1
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2 added to the repository
PASS: deep-2-dir2
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: deep-3-dir2
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3 added to the 
repository
PASS: deep-2-dir3
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: deep-3-dir3
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4 added to the 
repository
PASS: deep-2-dir4
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: deep-3-dir4
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4/dir5 added to 
the repository
PASS: deep-2-dir5
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: deep-3-dir5
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4/dir5/dir6 added 
to the repository
PASS: deep-2-dir6
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: deep-3-dir6
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4/dir5/dir6/dir7 
added to the repository
PASS: deep-2-dir7
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: deep-3-dir7
Directory 
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4/dir5/dir6/dir7/dir8 added 
to the repository
PASS: deep-2-dir8
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: deep-3-dir8
PASS: deep-4
cvs remove: scheduling `file1' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: deep-4a0
Removing file1;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4/dir5/dir6/dir7/dir8/file1,v
  <--  file1
new revision: delete; previous revision: 1.1
done
PASS: deep-4a1
PASS: deep-4a2
PASS: deep-4a3
PASS: deep-4b0a
PASS: deep-4b0b
PASS: deep-4b1
U dir6/file1
U dir6/dir7/file1
PASS: deep-4b2
cvs remove: scheduling `file1' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: deep-rm1
R dir7/file1
PASS: deep-rm2
PASS: deep-rm3
Removing dir7/file1;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4/dir5/dir6/dir7/file1,v  
<--  file1
new revision: delete; previous revision: 1.1
done
PASS: deep-rm4
PASS: deep-rm5
PASS: deep-rm6
cvs remove: Removing dir5
cvs remove: scheduling `dir5/file1' for removal
cvs remove: Removing dir5/dir6
cvs remove: scheduling `dir5/dir6/file1' for removal
cvs remove: use 'cvs commit' to remove these files permanently
PASS: deep-rm7
Removing dir5/file1;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4/dir5/file1,v  <--  file1
new revision: delete; previous revision: 1.1
done
Removing dir5/dir6/file1;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/dir3/dir4/dir5/dir6/file1,v  <--  
file1
new revision: delete; previous revision: 1.1
done
PASS: deep-rm8
PASS: deep-rm9
PASS: deep-rm10
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `first-dir': PASS: 
deep-5
PASS: basic2-1
cvs add: use 'cvs commit' to add these files permanently
PASS: 30-first-dir-file7
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1 added to the repository
PASS: 29-dir1
cvs add: use 'cvs commit' to add these files permanently
PASS: 30-dir1-file7
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2 added to the repository
PASS: 29-dir2
cvs add: use 'cvs commit' to add these files permanently
PASS: 30-dir2-file7
PASS: 31
PASS: 32
===================================================================
File: file6             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

===================================================================
File: file7             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

===================================================================
File: file6             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

===================================================================
File: file7             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

===================================================================
File: file6             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

===================================================================
File: file7             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

PASS: 33
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file6,v
done
Checking in first-dir/file6;
/tmp/cvs-sanity/cvsroot/first-dir/file6,v  <--  file6
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file7,v
done
Checking in first-dir/file7;
/tmp/cvs-sanity/cvsroot/first-dir/file7,v  <--  file7
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/file6,v
done
Checking in first-dir/dir1/file6;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/file6,v  <--  file6
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/file7,v
done
Checking in first-dir/dir1/file7;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/file7,v  <--  file7
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file6,v
done
Checking in first-dir/dir1/dir2/file6;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file6,v  <--  file6
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file7,v
done
Checking in first-dir/dir1/dir2/file7;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file7,v  <--  file7
initial revision: 1.1
done
PASS: 35
PASS: 36
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 37-first-dir
cvs add: use 'cvs commit' to add this file permanently
PASS: 38-first-dir
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 37-dir1
cvs add: use 'cvs commit' to add this file permanently
PASS: 38-dir1
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 37-dir2
cvs add: use 'cvs commit' to add this file permanently
PASS: 38-dir2
PASS: 39

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file6,v
Working file: first-dir/file6
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        second-dive: 1.1
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:30;  author: nagle;  state: Exp;
second dive
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file7,v
Working file: first-dir/file7
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        second-dive: 1.1
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:30;  author: nagle;  state: Exp;
second dive
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/file6,v
Working file: first-dir/dir1/file6
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        second-dive: 1.1
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:30;  author: nagle;  state: Exp;
second dive
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/file7,v
Working file: first-dir/dir1/file7
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        second-dive: 1.1
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:30;  author: nagle;  state: Exp;
second dive
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file6,v
Working file: first-dir/dir1/dir2/file6
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        second-dive: 1.1
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:30;  author: nagle;  state: Exp;
second dive
=============================================================================

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file7,v
Working file: first-dir/dir1/dir2/file7
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        second-dive: 1.1
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:03:30;  author: nagle;  state: Exp;
second dive
=============================================================================
PASS: 40
===================================================================
File: file14            Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

===================================================================
File: file6             Status: Locally Modified

   Working revision:    1.1     Tue Dec 17 04:03:30 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file6,v

===================================================================
File: no file file7             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:30 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file7,v

===================================================================
File: file14            Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

===================================================================
File: file6             Status: Locally Modified

   Working revision:    1.1     Tue Dec 17 04:03:30 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/dir1/file6,v

===================================================================
File: no file file7             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:30 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/dir1/file7,v

===================================================================
File: file14            Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file

===================================================================
File: file6             Status: Locally Modified

   Working revision:    1.1     Tue Dec 17 04:03:30 2002
   Repository revision: 1.1     
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file6,v

===================================================================
File: no file file7             Status: Locally Removed

   Working revision:    -1.1    Tue Dec 17 04:03:30 2002
   Repository revision: 1.1     
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file7,v

PASS: 41
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file14,v
done
Checking in first-dir/file14;
/tmp/cvs-sanity/cvsroot/first-dir/file14,v  <--  file14
initial revision: 1.1
done
Checking in first-dir/file6;
/tmp/cvs-sanity/cvsroot/first-dir/file6,v  <--  file6
new revision: 1.2; previous revision: 1.1
done
Removing first-dir/file7;
/tmp/cvs-sanity/cvsroot/first-dir/file7,v  <--  file7
new revision: delete; previous revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/file14,v
done
Checking in first-dir/dir1/file14;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/file14,v  <--  file14
initial revision: 1.1
done
Checking in first-dir/dir1/file6;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/file6,v  <--  file6
new revision: 1.2; previous revision: 1.1
done
Removing first-dir/dir1/file7;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/file7,v  <--  file7
new revision: delete; previous revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file14,v
done
Checking in first-dir/dir1/dir2/file14;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file14,v  <--  file14
initial revision: 1.1
done
Checking in first-dir/dir1/dir2/file6;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file6,v  <--  file6
new revision: 1.2; previous revision: 1.1
done
Removing first-dir/dir1/dir2/file7;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/dir2/file7,v  <--  file7
new revision: delete; previous revision: 1.1
done
PASS: 43
PASS: 43.5
PASS: 44
PASS: 45
PASS: 45.5
PASS: 46
PASS: 47
PASS: 48
Index: first-dir/file6
diff -c first-dir/file6:1.1 first-dir/file6:1.2
*** first-dir/file6:1.1 Mon Dec 16 20:03:30 2002
--- first-dir/file6     Mon Dec 16 20:03:32 2002
***************
*** 1 ****
--- 1,2 ----
  file6
+ file6
Index: first-dir/file7
diff -c first-dir/file7:1.1 first-dir/file7:removed
*** first-dir/file7:1.1 Mon Dec 16 20:03:30 2002
--- first-dir/file7     Mon Dec 16 20:03:33 2002
***************
*** 1 ****
- file7
--- 0 ----
Index: first-dir/dir1/file6
diff -c first-dir/dir1/file6:1.1 first-dir/dir1/file6:1.2
*** first-dir/dir1/file6:1.1    Mon Dec 16 20:03:30 2002
--- first-dir/dir1/file6        Mon Dec 16 20:03:32 2002
***************
*** 1 ****
--- 1,2 ----
  file6
+ file6
Index: first-dir/dir1/file7
diff -c first-dir/dir1/file7:1.1 first-dir/dir1/file7:removed
*** first-dir/dir1/file7:1.1    Mon Dec 16 20:03:30 2002
--- first-dir/dir1/file7        Mon Dec 16 20:03:33 2002
***************
*** 1 ****
- file7
--- 0 ----
Index: first-dir/dir1/dir2/file6
diff -c first-dir/dir1/dir2/file6:1.1 first-dir/dir1/dir2/file6:1.2
*** first-dir/dir1/dir2/file6:1.1       Mon Dec 16 20:03:30 2002
--- first-dir/dir1/dir2/file6   Mon Dec 16 20:03:32 2002
***************
*** 1 ****
--- 1,2 ----
  file6
+ file6
Index: first-dir/dir1/dir2/file7
diff -c first-dir/dir1/dir2/file7:1.1 first-dir/dir1/dir2/file7:removed
*** first-dir/dir1/dir2/file7:1.1       Mon Dec 16 20:03:30 2002
--- first-dir/dir1/dir2/file7   Mon Dec 16 20:03:33 2002
***************
*** 1 ****
- file7
--- 0 ----
PASS: 49
PASS: 50
PASS: 51
PASS: 52
PASS: 53
PASS: 54
PASS: 55


N second-dir/dir1/dir2/file14
N second-dir/dir1/dir2/file6
N second-dir/dir1/dir2/file7
N second-dir/dir1/file14
N second-dir/dir1/file6
N second-dir/dir1/file7
N second-dir/file14
N second-dir/file6
N second-dir/file7
No conflicts created by this import
cvs import: Importing /tmp/cvs-sanity/cvsroot/second-dir/dir1
cvs import: Importing /tmp/cvs-sanity/cvsroot/second-dir/dir1/dir2
PASS: 56
PASS: 57
PASS: 58
cvs update: warning: file7 is not (any longer) pertinent
PASS: 59
PASS: 60a
PASS: 60b
PASS: 61
PASS: 62
O 2002-12-17 04:03 +0000 nagle first-dir           =first-dir= /tmp/cvs-sanity/*
A 2002-12-17 04:03 +0000 nagle 1.1 file6     first-dir           == 
/tmp/cvs-sanity
A 2002-12-17 04:03 +0000 nagle 1.1 file7     first-dir           == 
/tmp/cvs-sanity
A 2002-12-17 04:03 +0000 nagle 1.1 file6     first-dir/dir1      == 
/tmp/cvs-sanity
A 2002-12-17 04:03 +0000 nagle 1.1 file7     first-dir/dir1      == 
/tmp/cvs-sanity
A 2002-12-17 04:03 +0000 nagle 1.1 file6     first-dir/dir1/dir2 == 
/tmp/cvs-sanity
A 2002-12-17 04:03 +0000 nagle 1.1 file7     first-dir/dir1/dir2 == 
/tmp/cvs-sanity
A 2002-12-17 04:03 +0000 nagle 1.1 file14    first-dir           == 
/tmp/cvs-sanity
M 2002-12-17 04:03 +0000 nagle 1.2 file6     first-dir           == 
/tmp/cvs-sanity
R 2002-12-17 04:03 +0000 nagle 1.2 file7     first-dir           == 
/tmp/cvs-sanity
A 2002-12-17 04:03 +0000 nagle 1.1 file14    first-dir/dir1      == 
/tmp/cvs-sanity
M 2002-12-17 04:03 +0000 nagle 1.2 file6     first-dir/dir1      == 
/tmp/cvs-sanity
R 2002-12-17 04:03 +0000 nagle 1.2 file7     first-dir/dir1      == 
/tmp/cvs-sanity
A 2002-12-17 04:03 +0000 nagle 1.1 file14    first-dir/dir1/dir2 == 
/tmp/cvs-sanity
M 2002-12-17 04:03 +0000 nagle 1.2 file6     first-dir/dir1/dir2 == 
/tmp/cvs-sanity
R 2002-12-17 04:03 +0000 nagle 1.2 file7     first-dir/dir1/dir2 == 
/tmp/cvs-sanity
F 2002-12-17 04:03 +0000 nagle                     =first-dir= /tmp/cvs-sanity/*
T 2002-12-17 04:03 +0000 nagle first-dir [rtagged-by-head:A]
T 2002-12-17 04:03 +0000 nagle first-dir [rtagged-by-tag:rtagged-by-head]
T 2002-12-17 04:03 +0000 nagle first-dir [rtagged-by-revision:1.1]
O 2002-12-17 04:03 +0000 nagle [1.1] first-dir           =first-dir= 
/tmp/cvs-sanity/*
U 2002-12-17 04:03 +0000 nagle 1.2 file6     first-dir           == 
/tmp/cvs-sanity/first-dir
U 2002-12-17 04:03 +0000 nagle 1.2 file7     first-dir           == 
/tmp/cvs-sanity/first-dir
PASS: basic2-64
PASS: files-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: files-2
cvs add: scheduling file `tfile' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: files-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/tfile,v
done
Checking in tfile;
/tmp/cvs-sanity/cvsroot/first-dir/tfile,v  <--  tfile
initial revision: 1.1
done
PASS: files-4
T tfile
PASS: files-5
PASS: files-6
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir added to the repository
--> Using per-directory sticky tag `C'
PASS: files-7
cvs add: scheduling file `.file' for addition on branch `C'
cvs add: use 'cvs commit' to add this file permanently
PASS: files-6
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir/sdir added to the repository
--> Using per-directory sticky tag `C'
PASS: files-7
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir/sdir/ssdir added to the 
repository
--> Using per-directory sticky tag `C'
PASS: files-8
cvs add: scheduling file `.file' for addition on branch `C'
cvs add: use 'cvs commit' to add this file permanently
PASS: files-9
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir/Attic/.file,v
done
Checking in .file;
/tmp/cvs-sanity/cvsroot/first-dir/dir/Attic/.file,v  <--  .file
new revision: 1.1.2.1; previous revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir/sdir/ssdir/Attic/.file,v
done
Checking in sdir/ssdir/.file;
/tmp/cvs-sanity/cvsroot/first-dir/dir/sdir/ssdir/Attic/.file,v  <--  .file
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: files-10
Checking in .file;
/tmp/cvs-sanity/cvsroot/first-dir/dir/Attic/.file,v  <--  .file
new revision: 1.1.2.2; previous revision: 1.1.2.1
done
Checking in ./sdir/ssdir/.file;
/tmp/cvs-sanity/cvsroot/first-dir/dir/sdir/ssdir/Attic/.file,v  <--  .file
new revision: 1.1.2.2; previous revision: 1.1.2.1
done
PASS: files-11
Checking in ./sdir/ssdir/.file;
/tmp/cvs-sanity/cvsroot/first-dir/dir/sdir/ssdir/Attic/.file,v  <--  .file
new revision: 1.1.2.3; previous revision: 1.1.2.2
done
Checking in .file;
/tmp/cvs-sanity/cvsroot/first-dir/dir/Attic/.file,v  <--  .file
new revision: 1.1.2.3; previous revision: 1.1.2.2
done
PASS: files-12
Checking in ./sdir/../sdir/ssdir/..///ssdir/.file;
/tmp/cvs-sanity/cvsroot/first-dir/dir/sdir/ssdir/Attic/.file,v  <--  .file
new revision: 1.1.2.4; previous revision: 1.1.2.3
done
PASS: files-13
Checking in ../../first-dir/dir/.file;
/tmp/cvs-sanity/cvsroot/first-dir/dir/Attic/.file,v  <--  .file
new revision: 1.1.2.4; previous revision: 1.1.2.3
done
PASS: files-14
PASS: spacefiles-1
cvs add: scheduling file `-c' for addition
cvs add: scheduling file `top' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: spacefiles-2
RCS file: /tmp/cvs-sanity/cvsroot/-c,v
done
Checking in -c;
/tmp/cvs-sanity/cvsroot/-c,v  <--  -c
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/top,v
done
Checking in top;
/tmp/cvs-sanity/cvsroot/top,v  <--  top
initial revision: 1.1
done
PASS: spacefiles-3
Directory /tmp/cvs-sanity/cvsroot/first dir added to the repository
PASS: spacefiles-4
Directory /tmp/cvs-sanity/cvsroot/-b added to the repository
PASS: spacefiles-5
cvs add: scheduling file `a file' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: spacefiles-6
RCS file: /tmp/cvs-sanity/cvsroot/first dir/a file,v
done
Checking in a file;
/tmp/cvs-sanity/cvsroot/first dir/a file,v  <--  a file
initial revision: 1.1
done
PASS: spacefiles-7
T a file
PASS: spacefiles-8
U ./top
PASS: spacefiles-9
cvs checkout: Updating -b
PASS: spacefiles-10
U ./-c
PASS: spacefiles-11
U ./-c
PASS: spacefiles-12
U first dir/a file
PASS: spacefiles-13
U first dir/a file
PASS: spacefiles-14
PASS: commit-readonly-1
PASS: commit-readonly-2
cvs add: scheduling file `m' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: commit-readonly-3
RCS file: /tmp/cvs-sanity/cvsroot/x/m,v
done
Checking in m;
/tmp/cvs-sanity/cvsroot/x/m,v  <--  m
initial revision: 1.1
done
PASS: commit-readonly-4
Checking in m;
/tmp/cvs-sanity/cvsroot/x/m,v  <--  m
new revision: 1.2; previous revision: 1.1
done
PASS: commit-readonly-5


N trdiff/bar
N trdiff/foo
No conflicts created by this import
PASS: rdiff-1
cvs checkout: Updating trdiff
U trdiff/bar
U trdiff/foo
PASS: rdiff-2
Checking in foo;
/tmp/cvs-sanity/cvsroot/trdiff/foo,v  <--  foo
new revision: 1.2; previous revision: 1.1
done
PASS: rdiff-3
cvs add: scheduling file `new' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: rdiff-4
RCS file: /tmp/cvs-sanity/cvsroot/trdiff/new,v
done
Checking in new;
/tmp/cvs-sanity/cvsroot/trdiff/new,v  <--  new
initial revision: 1.1
done
PASS: rdiff-5
cvs tag: Tagging .
T bar
T foo
T new
PASS: rdiff-6
===================================================================
File: foo               Status: Up-to-date

   Working revision:    1.2     Tue Dec 17 04:04:04 2002
   Repository revision: 1.2     /tmp/cvs-sanity/cvsroot/trdiff/foo,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      -ko

   Existing Tags:
        local-v0                        (revision: 1.2)
        T1                              (revision: 1.1.1.1)
        TRDIFF                          (branch: 1.1.1)

PASS: rdiff-7
cvs rdiff: Diffing trdiff
Index: trdiff/foo
diff -c trdiff/foo:1.1.1.1 trdiff/foo:1.2
*** trdiff/foo:1.1.1.1  Mon Dec 16 20:04:03 2002
--- trdiff/foo  Mon Dec 16 20:04:04 2002
***************
*** 1,2 ****
! $Id: foo,v 1.1.1.1 2002/12/17 04:04:03 nagle Exp $
! $Name: T1 $
--- 1,3 ----
! $Id: foo,v 1.2 2002/12/17 04:04:04 nagle Exp $
! $Name: local-v0 $
! something
Index: trdiff/new
diff -c /dev/null trdiff/new:1.1
*** /dev/null   Mon Dec 16 20:04:07 2002
--- trdiff/new  Mon Dec 16 20:04:05 2002
***************
*** 0 ****
--- 1,2 ----
+ #ident        "@(#)trdiff:$Name: local-v0 $:$Id: new,v 1.1 2002/12/17 
04:04:05 nagle Exp $"
+ new file
PASS: rdiff-8
PASS: diff-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: diff-2
cvs diff: I know nothing about xyzpdq
PASS: diff-3
cvs add: scheduling file `abc' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: diff-4
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/abc,v
done
Checking in abc;
/tmp/cvs-sanity/cvsroot/first-dir/abc,v  <--  abc
initial revision: 1.1
done
PASS: diff-5
Checking in abc;
/tmp/cvs-sanity/cvsroot/first-dir/abc,v  <--  abc
new revision: 1.2; previous revision: 1.1
done
PASS: diff-6
Index: abc
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/abc,v
retrieving revision 1.2
diff --ifdef=HAVE_WINSOCK_H -r1.2 abc
#ifndef HAVE_WINSOCK_H
extern int gethostname ();
#else /* HAVE_WINSOCK_H */
#include <winsock.h>
#endif /* HAVE_WINSOCK_H */
PASS: diff-7
PASS: 65
Directory /tmp/cvs-sanity/cvsroot/first-dir/subdir added to the repository
PASS: 65a0
cvs add: scheduling file `sfile' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: 65a1
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/sfile,v
done
Checking in sfile;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/sfile,v  <--  sfile
initial revision: 1.1
done
PASS: 65a2
cvs remove: scheduling `sfile' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 65a3
Removing sfile;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/sfile,v  <--  sfile
new revision: delete; previous revision: 1.1
done
PASS: 65a4
PASS: 65a5
PASS: 65a6
cvs add: use 'cvs commit' to add this file permanently
PASS: 66
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: 67
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 68
Removing file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: delete; previous revision: 1.1
done
PASS: 69
PASS: 69a0
===================================================================
Checking out file1
RCS:  /tmp/cvs-sanity/cvsroot/first-dir/Attic/file1,v
VERS: 1.1
***************
PASS: 69a1
PASS: 69a2
cvs add: re-adding file file1 (in place of dead revision 1.2)
cvs add: use 'cvs commit' to add these files permanently
PASS: 70
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.3; previous revision: 1.2
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: 71

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
Working file: file1
head: 1.3
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.3
date: 2002/12/17 04:04:13;  author: nagle;  state: Exp;  lines: +0 -0
test
----------------------------
revision 1.2
date: 2002/12/17 04:04:13;  author: nagle;  state: dead;  lines: +0 -0
test
----------------------------
revision 1.1
date: 2002/12/17 04:04:12;  author: nagle;  state: Exp;
test
=============================================================================
PASS: 72
cvs add: scheduling file `file4' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: death-file4-add
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
initial revision: 1.1
done
PASS: death-file4-ciadd
cvs remove: scheduling `file4' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: death-file4-rm
Removing file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: delete; previous revision: 1.1
done
PASS: death-file4-cirm
T file1
T file2
PASS: death-72a
PASS: 73
PASS: 74
PASS: death-file4-3
cvs add: use 'cvs commit' to add this file permanently
PASS: 75
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v
done
Checking in file3;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v  <--  file3
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: 76
Index: first-dir/file3
diff -c /dev/null first-dir/file3:1.1.2.1
*** /dev/null   Mon Dec 16 20:04:17 2002
--- first-dir/file3     Mon Dec 16 20:04:16 2002
***************
*** 0 ****
--- 1 ----
+ line1 from branch1
PASS: death-76a0
Index: first-dir/file3
diff -c first-dir/file3:1.1.2.1 first-dir/file3:removed
*** first-dir/file3:1.1.2.1     Mon Dec 16 20:04:16 2002
--- first-dir/file3     Mon Dec 16 20:04:17 2002
***************
*** 1 ****
- line1 from branch1
--- 0 ----
PASS: death-76a1
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 77
Removing file3;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v  <--  file3
new revision: delete; previous revision: 1.1.2.1
done
PASS: 78
cvs add: file `file3' will be added on branch `branch1' from version 1.1.2.2
cvs add: use 'cvs commit' to add this file permanently
PASS: 79
Checking in file3;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v  <--  file3
new revision: 1.1.2.3; previous revision: 1.1.2.2
done
PASS: 80
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.3.2.1; previous revision: 1.3
done
PASS: 81
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 82
Removing file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: delete; previous revision: 1.1.2
done
PASS: 83
cvs update: warning: file3 is not (any longer) pertinent
PASS: 84
PASS: death-file4-4
PASS: 85
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.3
retrieving revision 1.3.2.1
Merging differences between 1.3 and 1.3.2.1 into file1
cvs update: scheduling file2 for removal
U file3
PASS: 86
PASS: death-file4-5
PASS: 87
PASS: 87a
PASS: 88
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.4; previous revision: 1.3
done
Removing file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: delete; previous revision: 1.1
done
Checking in file3;
/tmp/cvs-sanity/cvsroot/first-dir/file3,v  <--  file3
new revision: 1.2; previous revision: 1.1
done
PASS: 89
U first-dir/file1
U first-dir/file3
PASS: 89a
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 90
Removing file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: delete; previous revision: 1.4
done
PASS: 91
PASS: 92
cvs [update aborted]: no such tag brnach1
PASS: 92.1a
PASS: 92.1b
PASS: 92.1c
PASS: 93
PASS: death-file4-6
PASS: 94
cvs update: file file1 has been modified, but has been removed in revision HEAD
cvs update: file file3 exists, but has been added in revision HEAD
PASS: 95
PASS: death-file4-7
PASS: death-file2-1
PASS: death2-1
cvs add: scheduling file `file1' for addition
cvs add: scheduling file `file4' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: death2-2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
initial revision: 1.1
done
PASS: death2-3
T file1
T file4
PASS: death2-4
T file1
T file4
PASS: death2-5
PASS: death2-6
cvs remove: scheduling `file1' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: death2-7
cvs diff: file1 was removed, no comparison available
PASS: death2-diff-1
Index: file1
===================================================================
RCS file: file1
diff -N file1
*** /tmp/cvsAAA467239   Mon Dec 16 20:04:27 2002
--- /dev/null   Mon Dec 16 20:04:27 2002
***************
*** 1 ****
- first revision
--- 0 ----
PASS: death2-diff-2
Removing file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: delete; previous revision: 1.1.2
done
PASS: death2-8
cvs diff: file1 was removed, no comparison available
PASS: death2-diff-3
Index: file1
===================================================================
RCS file: file1
diff -N file1
*** /tmp/cvsAAA606503   Mon Dec 16 20:04:28 2002
--- /dev/null   Mon Dec 16 20:04:28 2002
***************
*** 1 ****
- first revision
--- 0 ----
PASS: death2-diff-4
cvs diff: file1 no longer exists, no comparison available
PASS: death2-diff-5
Index: file1
===================================================================
RCS file: file1
diff -N file1
*** /tmp/cvsAAA704807   Mon Dec 16 20:04:28 2002
--- /dev/null   Mon Dec 16 20:04:28 2002
***************
*** 1 ****
- first revision
--- 0 ----
PASS: death2-diff-6
PASS: death2-rdiff-1
Index: first-dir/file1
diff -c first-dir/file1:1.1 first-dir/file1:removed
*** first-dir/file1:1.1 Mon Dec 16 20:04:26 2002
--- first-dir/file1     Mon Dec 16 20:04:28 2002
***************
*** 1 ****
- first revision
--- 0 ----
PASS: death2-rdiff-2
cvs add: file `file1' will be added on branch `branch' from version 1.1.2.1
cvs add: use 'cvs commit' to add this file permanently
PASS: death2-9
cvs diff: file1 is a new entry, no comparison available
PASS: death2-diff-7
Index: file1
===================================================================
RCS file: file1
diff -N file1
*** /dev/null   Mon Dec 16 20:04:28 2002
--- file1       Mon Dec 16 20:04:28 2002
***************
*** 0 ****
--- 1 ----
+ second revision
PASS: death2-diff-8
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.2; previous revision: 1.1.2.1
done
PASS: death2-10
cvs remove: scheduling `file4' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: death2-10a
Removing file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: delete; previous revision: 1.1.2
done
PASS: death2-10b
U file1
U file4
PASS: death2-11
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: death2-12
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: death2-13
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: 1.2; previous revision: 1.1
done
PASS: death2-13a
U file1
cvs update: file2 is no longer in the repository
cvs update: warning: file4 is not (any longer) pertinent
PASS: death2-14
cvs add: scheduling file `file2' for addition on branch `branch'
cvs add: use 'cvs commit' to add this file permanently
PASS: death2-15
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: death2-16
cvs add: scheduling file `file3' for addition on branch `branch'
cvs add: use 'cvs commit' to add this file permanently
PASS: death2-17
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v
done
Checking in file3;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v  <--  file3
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: death2-18
cvs diff: tag tag is not in file file3
PASS: death2-diff-9
Index: file3
===================================================================
RCS file: file3
diff -N file3
*** /dev/null   Mon Dec 16 20:04:37 2002
--- /tmp/cvsAAA491239   Mon Dec 16 20:04:37 2002
***************
*** 0 ****
--- 1 ----
+ first revision
PASS: death2-diff-10
Index: file1
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.1.2.2
diff -c -r1.1 -r1.1.2.2
*** file1       2002/12/17 04:04:26     1.1
--- file1       2002/12/17 04:04:28     1.1.2.2
***************
*** 1 ****
! first revision
--- 1 ----
! second revision
cvs diff: tag tag is not in file file2
cvs diff: tag tag is not in file file3
cvs diff: file4 no longer exists, no comparison available
PASS: death2-diff-11
Index: file1
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.1.2.2
diff -c -r1.1 -r1.1.2.2
*** file1       2002/12/17 04:04:26     1.1
--- file1       2002/12/17 04:04:28     1.1.2.2
***************
*** 1 ****
! first revision
--- 1 ----
! second revision
Index: file2
===================================================================
RCS file: file2
diff -N file2
*** /dev/null   Mon Dec 16 20:04:37 2002
--- /tmp/cvsCAA589543   Mon Dec 16 20:04:37 2002
***************
*** 0 ****
--- 1 ----
+ branch revision
Index: file3
===================================================================
RCS file: file3
diff -N file3
*** /dev/null   Mon Dec 16 20:04:37 2002
--- /tmp/cvsDAA589543   Mon Dec 16 20:04:37 2002
***************
*** 0 ****
--- 1 ----
+ first revision
Index: file4
===================================================================
RCS file: file4
diff -N file4
*** /tmp/cvsEAA589543   Mon Dec 16 20:04:37 2002
--- /dev/null   Mon Dec 16 20:04:37 2002
***************
*** 1 ****
- file4 first revision
--- 0 ----
PASS: death2-diff-12
U file1
cvs update: file2 is no longer in the repository
cvs update: file3 is no longer in the repository
U file4
PASS: death2-19
PASS: death2-20
cvs diff: file1 is a new entry, no comparison available
PASS: death2-diff-13
Index: file1
===================================================================
RCS file: file1
diff -N file1
*** /dev/null   Mon Dec 16 20:04:39 2002
--- /tmp/cvsAAA745191   Mon Dec 16 20:04:39 2002
***************
*** 0 ****
--- 1 ----
+ first revision
PASS: death2-diff-14
PASS: rmadd-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: rmadd-2
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: rmadd-3
cvs commit: cannot add file `file1' with revision `1.2.2.4'; must be on trunk
cvs [commit aborted]: correct above errors first!
PASS: rmadd-4
cvs commit: cannot add file `file1' with revision `1.2.2'; must be on trunk
cvs [commit aborted]: correct above errors first!
PASS: rmadd-5
cvs [commit aborted]: no such tag mybranch
PASS: rmadd-6
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 7.1
done
PASS: rmadd-7
T7
PASS: rmadd-7a
T file1
PASS: rmadd-8
T file1
PASS: rmadd-9
cvs add: scheduling file `file2' for addition on branch `7'
cvs add: use 'cvs commit' to add this file permanently
PASS: rmadd-10
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 7.1
done
PASS: rmadd-11
PASS: rmadd-12
cvs add: scheduling file `file3' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: rmadd-13
cvs commit: Up-to-date check failed for `file2'
cvs [commit aborted]: correct above errors first!
PASS: rmadd-14
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v
done
Checking in file3;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file3,v  <--  file3
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: rmadd-15
cvs add: scheduling file `file4' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: rmadd-16
cvs [commit aborted]: no such tag mynonbranch
PASS: rmadd-17
first file1
PASS: rmadd-18
cvs [commit aborted]: no such tag mynonbranch
PASS: rmadd-19
PASS: rmadd-20
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file4,v
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file4,v  <--  file4
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: rmadd-21
cvs add: scheduling file `file5' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: rmadd-22
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file5,v
done
Checking in file5;
/tmp/cvs-sanity/cvsroot/first-dir/file5,v  <--  file5
initial revision: 7.1
done
PASS: rmadd-23
Checking in file5;
/tmp/cvs-sanity/cvsroot/first-dir/file5,v  <--  file5
cvs commit: /tmp/cvs-sanity/cvsroot/first-dir/file5,v: revision 4.8 too low; 
must be higher than 7.1
cvs commit: could not check in file5
7.1 unlocked
PASS: rmadd-24
Checking in file5;
/tmp/cvs-sanity/cvsroot/first-dir/file5,v  <--  file5
new revision: 8.4; previous revision: 7.1
done
PASS: rmadd-24a
===================================================================
File: file5             Status: Up-to-date

   Working revision:    8.4     Tue Dec 17 04:04:46 2002
   Repository revision: 8.4     /tmp/cvs-sanity/cvsroot/first-dir/file5,v
   Sticky Tag:          8.4
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: rmadd-25
PASS: rmadd2-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: rmadd2-2
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: rmadd2-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: rmadd2-4
PASS: rmadd2-4a
cvs remove: scheduling `file1' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: rmadd2-5
Removing file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: delete; previous revision: 1.1
done
PASS: rmadd2-6
U file1
PASS: rmadd2-7
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.3; previous revision: 1.2
done
PASS: rmadd2-8
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.4; previous revision: 1.3
done
PASS: rmadd2-9
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.4
retrieving revision 1.3
Merging differences between 1.4 and 1.3 into file1
PASS: rmadd2-10
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.5; previous revision: 1.4
done
PASS: rmadd2-11
initial contents
PASS: rmadd2-12
initial contents
PASS: rmadd2-13
cvs update: scheduling file1 for removal
PASS: rmadd2-14
Removing file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: delete; previous revision: 1.5
done
PASS: rmadd2-15

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file1,v
Working file: file1
head: 1.6
branch:
locks: strict
access list:
symbolic names:
        tagone: 1.1
keyword substitution: kv
total revisions: 6
=============================================================================
PASS: rmadd2-16
===================================================================
File: no file file1             Status: Up-to-date

   Working revision:    No entry for file1
   Repository revision: 1.6     /tmp/cvs-sanity/cvsroot/first-dir/Attic/file1,v

   Existing Tags:
        tagone                          (revision: 1.1)

PASS: rmadd2-17


N dir1/file1
N dir1/sdir/sfile
No conflicts created by this import
cvs import: Importing /tmp/cvs-sanity/cvsroot/dir1/sdir
PASS: dirs-1
PASS: dirs-2
cvs update: Updating dir1
cvs update: Updating dir1/sdir
cvs update: cannot open directory /tmp/cvs-sanity/cvsroot/dir1/sdir: No such 
file or directory
cvs update: skipping directory dir1/sdir
PASS: dirs-3
cvs update: Updating dir1
cvs update: Updating dir1/sdir
cvs update: cannot open directory /tmp/cvs-sanity/cvsroot/dir1/sdir: No such 
file or directory
cvs update: skipping directory dir1/sdir
PASS: dirs-3a
cvs update: cannot open directory /tmp/cvs-sanity/cvsroot/dir1/sdir: No such 
file or directory
cvs update: skipping directory 
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `dir1/sdir': ** 
`release' aborted by user choice.
PASS: dirs-4
/file1/1.1.1.1/Tue Dec 17 04:04:55 2002//
D/sdir////
PASS: dirs-5
cvs update: Updating dir1
PASS: dirs-6
/file1/1.1.1.1/Tue Dec 17 04:04:55 2002//
D/sdir////
PASS: dirs-7
cvs update: Updating dir1
PASS: dirs-8
PASS: dirs2-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: dirs2-2
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir added to the repository
PASS: dirs2-3
cvs add: scheduling file `sdir/file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: dirs2-4
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/file1,v
done
Checking in sdir/file1;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/file1,v  <--  file1
initial revision: 1.1
done
PASS: dirs2-5
cvs update: Updating .
? sdir
PASS: dirs2-6
cvs update: Updating .
? sdir
PASS: dirs2-7
U first-dir/sdir/file1
PASS: dirs2-8
T sdir/file1
PASS: dirs2-9
cvs update: in directory sdir:
cvs [update aborted]: there is no version here; do 'cvs checkout' first
PASS: dirs2-10
U first-dir/sdir/file1
PASS: dirs2-11
cvs remove: scheduling `sdir/file1' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: dirs2-12
Removing sdir/file1;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/file1,v  <--  file1
new revision: delete; previous revision: 1.1.2
done
PASS: dirs2-13
cvs update: Updating .
? sdir
PASS: dirs2-14
PASS: branches-1
cvs add: scheduling file `file1' for addition
cvs add: scheduling file `file2' for addition
cvs add: scheduling file `file3' for addition
cvs add: scheduling file `file4' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: branches-2
PASS: branches-2a
PASS: branches-3
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: 1.2; previous revision: 1.1
done
PASS: branches-3.2
T file1
T file2
T file3
T file4
PASS: branches-3.3
cvs tag: Tagging .
T file1
T file2
T file3
T file4
PASS: branches-4
cvs update: Updating .
M file1
PASS: branches-5
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.1; previous revision: 1.1
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: 1.1.2.1; previous revision: 1.1
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: 1.2.2.1; previous revision: 1.2
done
PASS: branches-6
T file1
T file2
T file3
T file4
PASS: branches-7
PASS: branches-8
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.1.2.1; previous revision: 1.1.2.1
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: 1.2.2.1.2.1; previous revision: 1.2.2.1
done
PASS: branches-9
1:brbr
2:br1
3:ancest
4:brbr
PASS: branches-10
U file1
U file4
PASS: branches-11
1:br1
2:br1
3:ancest
4:br1
PASS: branches-12
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: 1.2.2.2; previous revision: 1.2.2.1
done
PASS: branches-12.2
U file1
U file2
U file4
PASS: branches-13
1:ancest
2:ancest
3:ancest
4:trunk-2
PASS: branches-14
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: 1.3; previous revision: 1.2
done
PASS: branches-14.2

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
Working file: file4
head: 1.3
branch:
locks: strict
access list:
symbolic names:
        brbr: 1.2.2.1.0.2
        br1: 1.2.0.2
keyword substitution: kv
total revisions: 6;     selected revisions: 6
description:
----------------------------
revision 1.3
date: 2002/12/17 04:05:11;  author: nagle;  state: Exp;  lines: +1 -1
trunk-change-after-branch
----------------------------
revision 1.2
date: 2002/12/17 04:05:04;  author: nagle;  state: Exp;  lines: +1 -1
branches:  1.2.2;
trunk-before-branch
----------------------------
revision 1.1
date: 2002/12/17 04:05:02;  author: nagle;  state: Exp;
add-it
----------------------------
revision 1.2.2.2
date: 2002/12/17 04:05:09;  author: nagle;  state: Exp;  lines: +1 -1
change-on-br1
----------------------------
revision 1.2.2.1
date: 2002/12/17 04:05:05;  author: nagle;  state: Exp;  lines: +1 -1
branches:  1.2.2.1.2;
modify
----------------------------
revision 1.2.2.1.2.1
date: 2002/12/17 04:05:06;  author: nagle;  state: Exp;  lines: +1 -1
modify
=============================================================================
PASS: branches-14.3
Index: file4
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
retrieving revision 1.1
retrieving revision 1.3
diff -c -r1.1 -r1.3
*** file4       2002/12/17 04:05:02     1.1
--- file4       2002/12/17 04:05:11     1.3
***************
*** 1 ****
! 4:trunk-1
--- 1 ----
! 4:trunk-3
PASS: branches-14.4
Index: file4
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
retrieving revision 1.1
retrieving revision 1.2.2.1
diff -c -r1.1 -r1.2.2.1
*** file4       2002/12/17 04:05:02     1.1
--- file4       2002/12/17 04:05:05     1.2.2.1
***************
*** 1 ****
! 4:trunk-1
--- 1 ----
! 4:br1
PASS: branches-14.5
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.1.2.1
Merging differences between 1.1.2.1 and 1.1.2.1.2.1 into file1
rcsmerge: warning: conflicts during merge
PASS: branches-15
<<<<<<< file1
1:ancest
=======
1:brbr
>>>>>>> 1.1.2.1.2.1
PASS: branches-16
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file3,v
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
done
PASS: branches-o1
PASS: branches2-1
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: branches2-2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: branches2-3
T file1
PASS: branches2-4
PASS: branches2-5
PASS: branches2-6
U first-dir/file1
PASS: branches2-7
cvs add: scheduling file `file2' for addition on branch `b1'
cvs add: use 'cvs commit' to add this file permanently
PASS: branches2-8
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1 added to the repository
--> Using per-directory sticky tag `b1'
PASS: branches2-9
cvs add: scheduling file `dir1/file3' for addition on branch `b1'
cvs add: use 'cvs commit' to add this file permanently
PASS: branches2-10
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file2,v  <--  file2
new revision: 1.1.2.1; previous revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir1/Attic/file3,v
done
Checking in dir1/file3;
/tmp/cvs-sanity/cvsroot/first-dir/dir1/Attic/file3,v  <--  file3
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: branches2-11
U first-dir/file1
PASS: branches2-12
cvs update: Updating dir1
U dir1/file3
PASS: branches2-13
===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:05:14 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          b2 (branch: 1.1.4)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file3             Status: Up-to-date

   Working revision:    1.1.2.1 Tue Dec 17 04:05:17 2002
   Repository revision: 1.1.2.1 
/tmp/cvs-sanity/cvsroot/first-dir/dir1/Attic/file3,v
   Sticky Tag:          b1 (branch: 1.1.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: branches2-14
cvs update: Updating dir1
U dir1/file3
PASS: branches2-15
===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:05:14 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          b2 (branch: 1.1.4)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file3             Status: Locally Added

   Working revision:    New file!
   Repository revision: No revision control file
   Sticky Tag:          b2 - MISSING from RCS file!
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: branches2-16
cvs update: Updating dir1
PASS: branches2-17
PASS: branches2-18
cvs update: Updating dir1
U dir1/file3
PASS: branches2-19
===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:05:14 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file3             Status: Up-to-date

   Working revision:    1.1.2.1 Tue Dec 17 04:05:17 2002
   Repository revision: 1.1.2.1 
/tmp/cvs-sanity/cvsroot/first-dir/dir1/Attic/file3,v
   Sticky Tag:          b1 (branch: 1.1.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: branches2-20
cvs update: Updating dir1
U dir1/file3
PASS: branches2-21
===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:05:14 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

===================================================================
File: file3             Status: Locally Added

   Working revision:    New file!
   Repository revision: 1.1     
/tmp/cvs-sanity/cvsroot/first-dir/dir1/Attic/file3,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: branches2-22
U first-dir/file1
U first-dir/file2
U first-dir/dir1/file3
PASS: branches2-23
U first-dir/file1
U first-dir/file2
U first-dir/dir1/file3
PASS: branches2-24
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir2 added to the repository
--> Using per-directory sticky tag `b1'
PASS: branches2-25
cvs add: scheduling file `dir2/file4' for addition on branch `b1'
cvs add: use 'cvs commit' to add this file permanently
PASS: branches2-26
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir2/Attic/file4,v
done
Checking in dir2/file4;
/tmp/cvs-sanity/cvsroot/first-dir/dir2/Attic/file4,v  <--  file4
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: branches2-27
cvs update: Updating dir2
U dir2/file4
PASS: branches2-28
===================================================================
File: file4             Status: Up-to-date

   Working revision:    1.1.2.1 Tue Dec 17 04:05:27 2002
   Repository revision: 1.1.2.1 
/tmp/cvs-sanity/cvsroot/first-dir/dir2/Attic/file4,v
   Sticky Tag:          b1 (branch: 1.1.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: branches2-29
Tb1
PASS: branches2-30
cvs update: Updating dir2
PASS: branches2-31
PASS: branches2-32
PASS: branches2-33
cvs add: scheduling file `file5' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: branches2-34
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/dir2/file5,v
done
Checking in file5;
/tmp/cvs-sanity/cvsroot/first-dir/dir2/file5,v  <--  file5
initial revision: 1.1
done
PASS: branches2-35
U dir2/file5
PASS: branches2-36
===================================================================
File: file5             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:05:30 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/dir2/file5,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: branches2-37
PASS: branches2-38
PASS: tagc-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: tagc-2
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: tagc-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: tagc-4
T file1
PASS: tagc-5
T file1
PASS: tagc-6
cvs tag: file1 is locally modified
cvs [tag aborted]: correct the above errors first!
PASS: tagc-7
U first-dir/file1
PASS: tagc-8
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.2; previous revision: 1.1
done
PASS: tagc-9
cvs tag: file1 is locally modified
cvs [tag aborted]: correct the above errors first!
PASS: tagc-10
PASS: tagf-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: tagf-2
cvs add: scheduling file `file1' for addition
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: tagf-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: tagf-4
T file1
T file2
PASS: tagf-5
PASS: tagf-6
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.1; previous revision: 1.1
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: tagf-7
T file1
T file2
PASS: tagf-8
===================================================================
File: file1             Status: Locally Modified

   Working revision:    1.1.2.1 Tue Dec 17 04:05:40 2002
   Repository revision: 1.1.2.1 /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          br (revision: 1.1.2.1)
   Sticky Date:         (none)
   Sticky Options:      (none)

   Existing Tags:
        br                              (revision: 1.1.2.1)

PASS: tagf-9
D file1
D file2
PASS: tagf-10
T file1
PASS: tagf-11
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
PASS: tagf-12
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1.2.1
retrieving revision 1.1
Merging differences between 1.1.2.1 and 1.1 into file1
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in file1
C file1
M file2
PASS: tagf-13
<<<<<<< file1
brmod
moremod
=======
>>>>>>> 1.1
PASS: tagf-14
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.4.1; previous revision: 1.1
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: 1.1.2.2; previous revision: 1.1.2.1
done
PASS: tagf-15
PASS: rcsdiff-1
cvs add: scheduling file `foo.c' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: rcsdiff-2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/foo.c,v
done
Checking in foo.c;
/tmp/cvs-sanity/cvsroot/first-dir/foo.c,v  <--  foo.c
initial revision: 1.1
done
PASS: rcsdiff-3
T foo.c
PASS: rcsdiff-4
===================================================================
Checking out foo.c
RCS:  /tmp/cvs-sanity/cvsroot/first-dir/foo.c,v
VERS: 1.1
***************
I am the first foo, and my name is $Name: first $.
PASS: rcsdiff-5
Checking in foo.c;
/tmp/cvs-sanity/cvsroot/first-dir/foo.c,v  <--  foo.c
new revision: 1.2; previous revision: 1.1
done
PASS: rcsdiff-6
T foo.c
PASS: rcsdiff-7
===================================================================
Checking out foo.c
RCS:  /tmp/cvs-sanity/cvsroot/first-dir/foo.c,v
VERS: 1.2
***************
I am the second foo, and my name is $Name: second $.
PASS: rcsdiff-8
cvs diff: Diffing .
Index: foo.c
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/foo.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -r1.1 -r1.2
1c1
< I am the first foo, and my name is $Name:  $.
---
> I am the second foo, and my name is $Name:  $.
PASS: rcsdiff-9
cvs diff: Diffing .
Index: foo.c
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/foo.c,v
retrieving revision 1.1
diff -r1.1 foo.c
1c1
< I am the first foo, and my name is $Name:  $.
---
> I am the once and future foo, and my name is $Name$.
PASS: rcsdiff-10
cvs add: use 'cvs commit' to add this file permanently
PASS: rcslib-diffrgx-1
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/rgx.c,v
done
Checking in rgx.c;
/tmp/cvs-sanity/cvsroot/first-dir/rgx.c,v  <--  rgx.c
initial revision: 1.1
done
PASS: rcslib-diffrgx-2
Index: rgx.c
===================================================================
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/rgx.c,v
retrieving revision 1.1
diff -c -F.*( -r1.1 rgx.c
*** rgx.c       2002/12/17 04:05:47     1.1
--- rgx.c       2002/12/17 04:05:48
*************** test_regex (whiz, bang)
*** 3,7 ****
  foo;
  bar;
  baz;
! grumble;
  }
--- 3,7 ----
  foo;
  bar;
  baz;
! mumble;
  }
PASS: rcslib-diffrgx-3
PASS: rcslib-merge-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: rcslib-merge-2
PASS: rcslib-merge-3
cvs add: use 'cvs commit' to add this file permanently
PASS: rcslib-merge-4
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: rcslib-merge-5
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.2; previous revision: 1.1
done
PASS: rcslib-merge-6
T file1
PASS: rcslib-merge-7
U file1
PASS: rcslib-merge-8
===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:05:50 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          patch1 (branch: 1.1.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: rcslib-merge-9
$Revision: 1.1 $
2
3
PASS: rcslib-merge-10
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: rcslib-merge-11
U file1
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into file1
rcsmerge: warning: conflicts during merge
PASS: rcslib-merge-12
<<<<<<< file1
1.1.2.1
2
three
=======
1.2
two
3
>>>>>>> 1.2
PASS: rcslib-merge-13
PASS: rcslib-symlink-1
U file2
PASS: rcslib-symlink-2
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file2
new revision: 1.1.2.2; previous revision: 1.1.2.1
done
PASS: rcslib-symlink-3
lrwxrwxrwx  1 nagle     100               7 Dec 16 20:05 
/tmp/cvs-sanity/cvsroot/first-dir/file2,v -> file1,v
PASS: rcslib-symlink-4
cvs tag: Tagging .
T file1
W file2 : the_tag already exists on version 1.1.2.1 : NOT MOVING tag to version 
1.1.2.2
PASS: rcslib-symlink-5
lrwxrwxrwx  1 nagle     100               7 Dec 16 20:05 
/tmp/cvs-sanity/cvsroot/first-dir/file2,v -> file1,v
PASS: rcslib-symlink-6
U first-dir/file1
U first-dir/file2
PASS: rcslib-symlink-7
cvs remove: scheduling `file2' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: rcslib-symlink-8
Removing file2;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file2
new revision: delete; previous revision: 1.2
done
PASS: rcslib-symlink-9
cvs rtag: could not read RCS file for file2
cvs rtag: could not read RCS file for first-dir/file2
cvs rtag: could not read RCS file for first-dir/file2
PASS: rcslib-symlink-10
PASS: multibranch-1
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: multibranch-2
PASS: multibranch-3
cvs tag: Tagging .
T file1
PASS: multibranch-4
cvs tag: Tagging .
T file1
PASS: multibranch-5
PASS: multibranch-6
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: multibranch-7
U file1
PASS: multibranch-8
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.4.1; previous revision: 1.1
done
PASS: multibranch-9
U file1
PASS: multibranch-10
on-br1
PASS: multibranch-11
U file1
PASS: multibranch-12
1:trunk-1
br2 adds a line
PASS: multibranch-13

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
Working file: file1
head: 1.1
branch:
locks: strict
access list:
symbolic names:
        br2: 1.1.0.4
        br1: 1.1.0.2
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.1
date: 2002/12/17 04:05:58;  author: nagle;  state: Exp;
branches:  1.1.2;  1.1.4;
add-it
----------------------------
revision 1.1.4.1
date: 2002/12/17 04:06:01;  author: nagle;  state: Exp;  lines: +1 -0
modify-on-br2
----------------------------
revision 1.1.2.1
date: 2002/12/17 04:05:59;  author: nagle;  state: Exp;  lines: +1 -1
modify-on-br1
=============================================================================
PASS: multibranch-14


I first-dir/RCS
N first-dir/imported-f1
N first-dir/imported-f2
N first-dir/imported-f3
N first-dir/imported-f4
No conflicts created by this import
PASS: import-96
PASS: import-96.5
U first-dir/imported-f1
U first-dir/imported-f2
U first-dir/imported-f3
U first-dir/imported-f4
PASS: import-97
PASS: import-98-1
PASS: import-98-2
PASS: import-98-3
PASS: import-98-4
PASS: import-98.5
cvs remove: scheduling `imported-f1' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: import-99
cvs commit: Examining .
Removing imported-f1;
/tmp/cvs-sanity/cvsroot/first-dir/imported-f1,v  <--  imported-f1
new revision: delete; previous revision: 1.1.1.1
done
Checking in imported-f2;
/tmp/cvs-sanity/cvsroot/first-dir/imported-f2,v  <--  imported-f2
new revision: 1.2; previous revision: 1.1
done
PASS: import-100

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/imported-f1,v
Working file: imported-f1
head: 1.2
branch:
locks: strict
access list:
symbolic names:
        junk-1_0: 1.1.1.1
        vendor-branch: 1.1.1
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.2
date: 2002/12/17 04:06:07;  author: nagle;  state: dead;  lines: +0 -0
local-changes
----------------------------
revision 1.1
date: 2002/12/17 04:06:05;  author: nagle;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.1
date: 2002/12/17 04:06:05;  author: nagle;  state: Exp;  lines: +0 -0
first-import
=============================================================================
PASS: import-101
cvs update: Updating .
U imported-f1
U imported-f2
PASS: import-102
cvs remove: scheduling `imported-f4' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: import-103
Removing imported-f4;
/tmp/cvs-sanity/cvsroot/first-dir/imported-f4,v  <--  imported-f4
new revision: delete; previous revision: 1.1.1.1
done
PASS: import-104
cvs update: warning: imported-f1 is not (any longer) pertinent
U imported-f2
PASS: import-105



 cvs checkout -jvendor-branch:yesterday -jvendor-branch first-dir
2 conflicts created by this import.
C first-dir/imported-f1
C first-dir/imported-f2
I first-dir/RCS
U first-dir/imported-f3
U first-dir/imported-f4
Use the following command to help the merge:
PASS: import-106
PASS: import-106.5
cvs checkout: Updating first-dir
U first-dir/imported-f3
U first-dir/imported-f4
PASS: import-107
PASS: import-108
PASS: import-109-2
PASS: import-109-3
U imported-f1
U imported-f2
PASS: import-110
PASS: import-111
cvs update: warning: imported-f1 is not (any longer) pertinent
U imported-f2
PASS: import-112
cvs checkout: file first-dir/imported-f1 does not exist, but is present in 
revision junk-2_0
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/imported-f2,v
retrieving revision 1.1.1.1
retrieving revision 1.1.1.2
Merging differences between 1.1.1.1 and 1.1.1.2 into imported-f2
rcsmerge: warning: conflicts during merge
PASS: import-113
PASS: import-114
PASS: import-115-2
PASS: import-115-3
imported file2
<<<<<<< imported-f2
import should not expand $Id: imported-f2,v 1.2 2002/12/17 04:06:07 nagle Exp $
local-change
=======
import should not expand $Id: imported-f2,v 1.1.1.2 2002/12/17 04:06:11 nagle 
Exp $
rev 2 of file 2
>>>>>>> 1.1.1.2
PASS: import-116


N first-dir/file1
N first-dir/file2
No conflicts created by this import
PASS: importb-1



 cvs -d /tmp/cvs-sanity/cvsroot checkout -jfreemunger:yesterday -jfreemunger 
first-dir
2 conflicts created by this import.
C first-dir/file1
C first-dir/file2
Use the following command to help the merge:
PASS: importb-2
cvs [import aborted]: Only branches with two dots are supported: 1
PASS: importb-3
U first-dir/file1
U first-dir/file2
PASS: importb-4

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
Working file: file1
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
        freemunger-1_0: 1.1.3.1
        freemunger: 1.1.3
        openmunger-1_0: 1.1.1.1
        openmunger: 1.1.1
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.1
date: 2002/12/17 04:06:16;  author: nagle;  state: Exp;
branches:  1.1.1;  1.1.3;
Initial revision
----------------------------
revision 1.1.3.1
date: 2002/12/17 04:06:16;  author: nagle;  state: Exp;  lines: +1 -1
add
----------------------------
revision 1.1.1.1
date: 2002/12/17 04:06:16;  author: nagle;  state: Exp;  lines: +0 -0
add
=============================================================================
PASS: importb-5


N first-dir/adir/sub1/file1
N first-dir/adir/sub1/ssdir/ssfile
N first-dir/adir/sub2/file2
N first-dir/bdir/subdir/file1
N first-dir/cdir/cfile
No conflicts created by this import
cvs import: Importing /tmp/cvs-sanity/cvsroot/first-dir/adir
cvs import: Importing /tmp/cvs-sanity/cvsroot/first-dir/adir/sub1
cvs import: Importing /tmp/cvs-sanity/cvsroot/first-dir/adir/sub1/ssdir
cvs import: Importing /tmp/cvs-sanity/cvsroot/first-dir/adir/sub2
cvs import: Importing /tmp/cvs-sanity/cvsroot/first-dir/bdir
cvs import: Importing /tmp/cvs-sanity/cvsroot/first-dir/bdir/subdir
cvs import: Importing /tmp/cvs-sanity/cvsroot/first-dir/cdir
PASS: importc-1
U first-dir/adir/sub1/file1
U first-dir/adir/sub1/ssdir/ssfile
U first-dir/adir/sub2/file2
U first-dir/bdir/subdir/file1
U first-dir/cdir/cfile
PASS: importc-2
cvs update: Updating adir/sub1
cvs update: Updating adir/sub1/ssdir
PASS: importc-3
cvs update: Updating adir/sub1
cvs update: Updating adir/sub1/ssdir
cvs update: Updating bdir/subdir
PASS: importc-4
PASS: importc-5
M cdir/cfile
PASS: importc-6
cvs commit: in directory adir/sub1/ssdir:
cvs [commit aborted]: there is no version here; do 'cvs checkout' first
PASS: importc-7
Checking in cdir/cfile;
/tmp/cvs-sanity/cvsroot/first-dir/cdir/cfile,v  <--  cfile
new revision: 1.1.1.1.2.1; previous revision: 1.1.1.1
done
PASS: importc-7a

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/cdir/cfile,v
Working file: cdir/cfile
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
        wip_test: 1.1.1.1.0.2
        release: 1.1.1.1
        vendor: 1.1.1
keyword substitution: kv
total revisions: 3;     selected revisions: 3
description:
----------------------------
revision 1.1
date: 2034/12/26 02:01:18;  author: nagle;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.1
date: 2034/12/26 02:01:18;  author: nagle;  state: Exp;  lines: +0 -0
branches:  1.1.1.1.2;
import-it
----------------------------
revision 1.1.1.1.2.1
date: 2002/12/17 04:06:20;  author: nagle;  state: Exp;  lines: +1 -0
modify
=============================================================================
PASS: importc-8

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/bdir/subdir/file1,v
Working file: bdir/subdir/file1
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
        wip_test: 1.1.1.1.0.2
        release: 1.1.1.1
        vendor: 1.1.1
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.1
date: 1971/07/04 10:43:18;  author: nagle;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.1
date: 1971/07/04 10:43:18;  author: nagle;  state: Exp;  lines: +0 -0
import-it
=============================================================================
PASS: importc-9
cvs [import aborted]: directory ../other not relative within the repository
PASS: importc-10
cvs [import aborted]: directory /tmp/cvs-sanity/other not relative within the 
repository
PASS: importc-11
PASS: importc-12
PASS: import-after-initial-1
PASS: import-after-initial-2
cvs add: use 'cvs commit' to add this file permanently
PASS: import-after-initial-3
RCS file: /tmp/cvs-sanity/cvsroot/x/m,v
done
Checking in m;
/tmp/cvs-sanity/cvsroot/x/m,v  <--  m
initial revision: 1.1
done
PASS: import-after-initial-4
PASS: import-after-initial-5
original
PASS: import-after-initial-6
PASS: join-1
cvs add: scheduling file `file3' for addition
cvs add: scheduling file `file4' for addition
cvs add: scheduling file `file6' for addition
cvs add: scheduling file `file8' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: join-2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file3,v
done
Checking in file3;
/tmp/cvs-sanity/cvsroot/first-dir/file3,v  <--  file3
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file4,v
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file6,v
done
Checking in file6;
/tmp/cvs-sanity/cvsroot/first-dir/file6,v  <--  file6
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file8,v
done
Checking in file8;
/tmp/cvs-sanity/cvsroot/first-dir/file8,v  <--  file8
initial revision: 1.1
done
PASS: join-3
T file3
T file4
T file6
T file8
PASS: join-4
cvs add: scheduling file `file2' for addition
cvs add: scheduling file `file7' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: join-5
cvs remove: scheduling `file6' for removal
cvs remove: scheduling `file8' for removal
cvs remove: use 'cvs commit' to remove these files permanently
PASS: join-6
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: 1.2; previous revision: 1.1
done
Removing file6;
/tmp/cvs-sanity/cvsroot/first-dir/file6,v  <--  file6
new revision: delete; previous revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file7,v
done
Checking in file7;
/tmp/cvs-sanity/cvsroot/first-dir/file7,v  <--  file7
initial revision: 1.1
done
Removing file8;
/tmp/cvs-sanity/cvsroot/first-dir/file8,v  <--  file8
new revision: delete; previous revision: 1.1
done
PASS: join-7
U first-dir/file3
U first-dir/file4
U first-dir/file6
U first-dir/file8
PASS: join-8
cvs add: scheduling file `file5' for addition on branch `branch'
cvs add: use 'cvs commit' to add this file permanently
PASS: join-9
Checking in file3;
/tmp/cvs-sanity/cvsroot/first-dir/file3,v  <--  file3
new revision: 1.1.2.1; previous revision: 1.1
done
Checking in file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: 1.1.2.1; previous revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file5,v
done
Checking in file5;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file5,v  <--  file5
new revision: 1.1.2.1; previous revision: 1.1
done
Checking in file6;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file6,v  <--  file6
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: join-10
T file3
T file4
T file5
T file6
T file8
PASS: join-11
cvs add: scheduling file `file1' for addition on branch `branch'
cvs add: scheduling file `file2' for addition on branch `branch'
cvs add: use 'cvs commit' to add these files permanently
PASS: join-12
cvs remove: scheduling `file3' for removal
cvs remove: scheduling `file4' for removal
cvs remove: scheduling `file5' for removal
cvs remove: scheduling `file6' for removal
cvs remove: use 'cvs commit' to remove these files permanently
PASS: join-13
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file1,v  <--  file1
new revision: 1.1.2.1; previous revision: 1.1
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: 1.1.2.1; previous revision: 1.1
done
Removing file3;
/tmp/cvs-sanity/cvsroot/first-dir/file3,v  <--  file3
new revision: delete; previous revision: 1.1.2.1
done
Removing file4;
/tmp/cvs-sanity/cvsroot/first-dir/file4,v  <--  file4
new revision: delete; previous revision: 1.1.2.1
done
Removing file5;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file5,v  <--  file5
new revision: delete; previous revision: 1.1.2.1
done
Removing file6;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/file6,v  <--  file6
new revision: delete; previous revision: 1.1.2.1
done
PASS: join-14
T file1
T file2
T file8
PASS: join-15
U first-dir/file1
U first-dir/file2
cvs checkout: file first-dir/file2 exists, but has been added in revision T2
U first-dir/file3
cvs checkout: scheduling first-dir/file3 for removal
U first-dir/file4
cvs checkout: scheduling first-dir/file4 for removal
U first-dir/file7
PASS: join-16
A file1
R file3
R file4
PASS: join-17
U file1
cvs update: file file2 exists, but has been added in revision T2
cvs update: scheduling file3 for removal
M file4
cvs update: file file4 is locally modified, but has been removed in revision T2
PASS: join-18
A file1
R file3
M file4
PASS: join-19
U first-dir/file1
U first-dir/file2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into file2
U first-dir/file3
cvs checkout: scheduling first-dir/file3 for removal
U first-dir/file4
cvs checkout: file first-dir/file4 has been modified, but has been removed in 
revision branch
U first-dir/file7
PASS: join-20
A file1
M file2
R file3
PASS: join-21
U first-dir/file2
U first-dir/file3
U first-dir/file4
U first-dir/file7
PASS: join-22
U file1
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into file2
cvs update: scheduling file3 for removal
M file4
cvs update: file file4 is locally modified, but has been removed in revision 
branch
PASS: join-23
A file1
M file2
R file3
M file4
PASS: join-24
U first-dir/file2
U first-dir/file3
U first-dir/file4
U first-dir/file7
PASS: join-25
T file2
T file3
T file4
T file7
PASS: join-26
PASS: join-27
U file1
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into file2
cvs update: scheduling file3 for removal
cvs update: file file4 has been modified, but has been removed in revision 
branch
U file8
PASS: join-28
A file1
M file2
R file3
A file8
PASS: join-29
U first-dir/file2
U first-dir/file3
U first-dir/file4
U first-dir/file7
PASS: join-30
T file2
T file3
T file4
T file7
PASS: join-31
Checking in file7;
/tmp/cvs-sanity/cvsroot/first-dir/file7,v  <--  file7
new revision: 1.2; previous revision: 1.1
done
PASS: join-32
T file2
T file3
T file4
T file7
PASS: join-33
cvs update: file file4 does not exist, but is present in revision T3
U file7
PASS: join-34
A file7
PASS: join-35
A file7
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file7,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into file7
PASS: join-36
A file7
PASS: join-37
PASS: join2-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: join2-2
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: join2-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: join2-4
T file1
PASS: join2-5
PASS: join2-6
cvs add: scheduling file `bradd' for addition on branch `br1'
cvs add: use 'cvs commit' to add this file permanently
PASS: join2-6a
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/Attic/bradd,v
done
Checking in bradd;
/tmp/cvs-sanity/cvsroot/first-dir/Attic/bradd,v  <--  bradd
new revision: 1.1.2.1; previous revision: 1.1
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: join2-7
U file1
PASS: join2-8
===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:06:50 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: join2-9
Tbr1
PASS: join2-10
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into file1
PASS: join2-11
initial contents of file1
modify on branch
PASS: join2-12
===================================================================
File: file1             Status: Locally Modified

   Working revision:    1.1     Result of merge
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: join2-13
Tbr1
PASS: join2-14
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.2; previous revision: 1.1
done
PASS: join2-15
U file1
PASS: join2-16
cvs update: warning: bradd is not (any longer) pertinent
U file1
PASS: join2-17-circumvent
U bradd
PASS: join2-18
===================================================================
File: bradd             Status: Locally Added

   Working revision:    New file!
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/Attic/bradd,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: join2-19
Checking in bradd;
/tmp/cvs-sanity/cvsroot/first-dir/bradd,v  <--  bradd
new revision: 1.2; previous revision: 1.1
done
PASS: join2-20
PASS: join3-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: join3-2
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: join3-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: join3-4
T file1
PASS: join3-5
PASS: join3-6
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: join3-7
U file1
PASS: join3-8
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: join3-8a
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.2; previous revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: join3-9
T file1
T file2
PASS: join3-10
U file1
cvs update: file2 is no longer in the repository
PASS: join3-11
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into file1
rcsmerge: warning: conflicts during merge
U file2
PASS: join3-12
initial contents of file1
<<<<<<< file1
br1:line1
=======
trunk:line1
>>>>>>> 1.2
PASS: join3-13
cvs update: warning: file1 was lost
U file1
PASS: join3-14
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.2.2.1; previous revision: 1.2
done
PASS: join3-15
U file1
PASS: join3-16
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.2.2.1
Merging differences between 1.1 and 1.2.2.1 into file1
rcsmerge: warning: conflicts during merge
PASS: join3-17
initial contents of file1
<<<<<<< file1
br1:line1
=======
trunk:line1
br2:line1
>>>>>>> 1.2.2.1
PASS: join3-18
PASS: join-readonly-conflict-1
Directory /tmp/cvs-sanity/cvsroot/x added to the repository
cvs add: use 'cvs commit' to add this file permanently
RCS file: /tmp/cvs-sanity/cvsroot/x/m,v
done
Checking in m;
/tmp/cvs-sanity/cvsroot/x/m,v  <--  m
initial revision: 1.1
done
T m
Checking in m;
/tmp/cvs-sanity/cvsroot/x/m,v  <--  m
new revision: 1.1.2.1; previous revision: 1.1
done
cvs update: warning: m was lost
U m
RCS file: /tmp/cvs-sanity/cvsroot/x/m,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into m
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in m
C m
cvs update: warning: m was lost
U m
RCS file: /tmp/cvs-sanity/cvsroot/x/m,v
retrieving revision 1.1
retrieving revision 1.1.2.1
Merging differences between 1.1 and 1.1.2.1 into m
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in m
C m
PASS: join-readonly-conflict-2
PASS: join-admin-1
Directory /tmp/cvs-sanity/cvsroot/x added to the repository
===================================================================
File: b                 Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:07:21 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/x/b,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: join-admin-1
PASS: 117
cvs add: use 'cvs commit' to add this file permanently
PASS: 118
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
done
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
initial revision: 1.1
done
PASS: 119
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 120
Removing a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
new revision: delete; previous revision: 1.1
done
PASS: 121
PASS: 122
PASS: 123
PASS: newb-123a
cvs add: scheduling file `a' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: newb-123b
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
done
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
initial revision: 1.1
done
PASS: newb-123c
T a
PASS: newb-123d
U first-dir/a
PASS: newb-123e
U first-dir/a
PASS: newb-123f
cvs remove: scheduling `a' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: newb-123g
Removing a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
new revision: delete; previous revision: 1.1.2
done
PASS: newb-123h
cvs checkout: warning: first-dir/a is not (any longer) pertinent
PASS: newb-123i
===================================================================
File: a                 Status: Needs Patch

   Working revision:    1.1     Tue Dec 17 04:07:23 2002
   Repository revision: 1.1.2.1 /tmp/cvs-sanity/cvsroot/first-dir/a,v
   Sticky Tag:          branch (branch: 1.1.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: newb-123j0
cvs update: warning: a is not (any longer) pertinent
PASS: newb-123j
PASS: newb-123k
PASS: conflicts-124
cvs add: scheduling file `a' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: conflicts-125
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
done
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
initial revision: 1.1
done
PASS: conflicts-126
cvs checkout: Updating first-dir
===================================================================
Checking out first-dir/a
RCS:  /tmp/cvs-sanity/cvsroot/first-dir/a,v
VERS: 1.1
***************
PASS: conflicts-126.5
PASS: 127
PASS: 127a
Directory /tmp/cvs-sanity/cvsroot/first-dir/dir1 added to the repository
PASS: conflicts-127b
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
new revision: 1.2; previous revision: 1.1
done
PASS: conflicts-128
cvs checkout: Updating first-dir
===================================================================
Checking out first-dir/a
RCS:  /tmp/cvs-sanity/cvsroot/first-dir/a,v
VERS: 1.2
***************
add a line
PASS: conflicts-128.5
cvs commit: Up-to-date check failed for `a'
cvs [commit aborted]: correct above errors first!
PASS: conflicts-129
===================================================================
File: a                 Status: Needs Merge

   Working revision:    1.1     Tue Dec 17 04:07:30 2002
   Repository revision: 1.2     /tmp/cvs-sanity/cvsroot/first-dir/a,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: conflicts-status-0
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into a
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in a
C a
PASS: conflicts-129a
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into a
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in a
C a
? dir1
? sdir
PASS: conflicts-130
===================================================================
File: a                 Status: File had conflicts on merge

   Working revision:    1.2     Result of merge
   Repository revision: 1.2     /tmp/cvs-sanity/cvsroot/first-dir/a,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: conflicts-status-1
cvs commit: file `a' had a conflict and has not been modified
cvs [commit aborted]: correct above errors first!
PASS: conflicts-131
cvs commit: warning: file `a' seems to still contain conflict indicators
PASS: conflicts-status-2
cvs commit: warning: file `a' seems to still contain conflict indicators
PASS: conflicts-status-3
cvs commit: warning: file `a' seems to still contain conflict indicators
PASS: conflicts-status-4
===================================================================
File: a                 Status: File had conflicts on merge

   Working revision:    1.2     Result of merge
   Repository revision: 1.2     /tmp/cvs-sanity/cvsroot/first-dir/a,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: conflicts-status-5
cvs commit: warning: file `a' seems to still contain conflict indicators
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
new revision: 1.3; previous revision: 1.2
done
PASS: conflicts-132
===================================================================
File: a                 Status: Locally Modified

   Working revision:    1.3     Tue Dec 17 04:07:36 2002
   Repository revision: 1.3     /tmp/cvs-sanity/cvsroot/first-dir/a,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: conflicts-status-6
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
new revision: 1.4; previous revision: 1.3
done
PASS: conflicts-133
===================================================================
File: a                 Status: Up-to-date

   Working revision:    1.4     Tue Dec 17 04:07:38 2002
   Repository revision: 1.4     /tmp/cvs-sanity/cvsroot/first-dir/a,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: conflicts-status-7
cvs add: scheduling file `abc' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: 134
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/abc,v
done
Checking in abc;
/tmp/cvs-sanity/cvsroot/first-dir/abc,v  <--  abc
initial revision: 1.1
done
PASS: 135
U first-dir/abc
? first-dir/dir1
? first-dir/sdir
PASS: conflicts-136
PASS: conflicts-137
Directory /tmp/cvs-sanity/cvsroot/first-dir/subdir added to the repository
PASS: 138
U first-dir/abc
PASS: 139
cvs add: scheduling file `sss' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: 140
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/sss,v
done
Checking in sss;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/sss,v  <--  sss
initial revision: 1.1
done
PASS: 140
U subdir/sss
PASS: 141
PASS: 142
PASS: conflicts2-142a1
cvs add: scheduling file `a' for addition
cvs add: scheduling file `abc' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: conflicts2-142a2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/a,v
done
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/abc,v
done
Checking in abc;
/tmp/cvs-sanity/cvsroot/first-dir/abc,v  <--  abc
initial revision: 1.1
done
PASS: conflicts2-142a3
U first-dir/a
U first-dir/abc
PASS: conflicts2-142a4
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/a,v  <--  a
new revision: 1.2; previous revision: 1.1
done
PASS: conflicts2-142b2
cvs remove: scheduling `a' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: conflicts2-142b3
cvs update: conflict: removed a was modified by second party
C a
PASS: conflicts2-142b4
U a
cvs add: a, version 1.1, resurrected
PASS: conflicts2-142b5
PASS: conflicts2-142b6
cvs remove: scheduling `first-dir/a' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: conflicts2-142b7
cvs add: nothing known about first-dir
cvs add: first-dir/a, version 1.2, resurrected
PASS: conflicts2-142b8
cvs remove: scheduling `a' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: conflicts2-142b9
U a
cvs add: a, version 1.2, resurrected
PASS: conflicts2-142b10
PASS: conflicts2-142b11
cvs remove: scheduling `abc' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: conflicts2-142c0
Removing abc;
/tmp/cvs-sanity/cvsroot/first-dir/abc,v  <--  abc
new revision: delete; previous revision: 1.1
done
PASS: conflicts2-142c1
cvs remove: scheduling `abc' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: conflicts2-142c2
cvs update: Updating .
PASS: conflicts2-142c3
cvs add: scheduling file `aa.c' for addition
cvs add: scheduling file `same.c' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: conflicts2-142d0
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/aa.c,v
done
Checking in aa.c;
/tmp/cvs-sanity/cvsroot/first-dir/aa.c,v  <--  aa.c
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/same.c,v
done
Checking in same.c;
/tmp/cvs-sanity/cvsroot/first-dir/same.c,v  <--  same.c
initial revision: 1.1
done
PASS: conflicts2-142d1
cvs update: move away aa.c; it is in the way
C aa.c
U same.c
PASS: conflicts2-142d2
cvs status: move away aa.c; it is in the way
===================================================================
File: aa.c              Status: Unresolved Conflict

   Working revision:    No entry for aa.c
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/aa.c,v

PASS: conflicts2-142d3
cvs add: aa.c added independently by second party
PASS: conflicts2-142d4
PASS: conflicts2-142d6
U aa.c
PASS: conflicts2-142d7
PASS: conflicts2-142d8
PASS: conflicts3-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: conflicts3-2
PASS: conflicts3-3
cvs add: scheduling file `file1' for addition
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: conflicts3-4
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: conflicts3-5
U file1
U file2
PASS: conflicts3-6
PASS: conflicts3-7
U file1
U file2
PASS: conflicts3-8
PASS: conflicts3-9
cvs remove: scheduling `file1' for removal
cvs remove: scheduling `file2' for removal
cvs remove: use 'cvs commit' to remove these files permanently
PASS: conflicts3-10
Removing file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: delete; previous revision: 1.1
done
Removing file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: delete; previous revision: 1.1
done
PASS: conflicts3-11
cvs update: warning: file1 is not (any longer) pertinent
cvs update: warning: file2 is not (any longer) pertinent
PASS: conflicts3-12
cvs update: warning: file1 is not (any longer) pertinent
cvs update: warning: file2 is not (any longer) pertinent
PASS: conflicts3-13
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir added to the repository
PASS: conflicts3-14
cvs add: scheduling file `sdir/sfile' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: conflicts3-14a
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir/sfile,v
done
Checking in sdir/sfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/sfile,v  <--  sfile
initial revision: 1.1
done
PASS: conflicts3-14b
? sdir
cvs update: ignoring sdir (CVS/Repository missing)
PASS: conflicts3-15
? sdir
cvs update: ignoring sdir (CVS/Entries missing)
PASS: conflicts3-16
? first-dir/sdir
cvs update: ignoring first-dir/sdir (CVS/Entries missing)
PASS: conflicts3-16a
? newdir
PASS: conflicts3-17
cvs update: ignoring newdir (CVS/Repository missing)
PASS: conflicts3-18
cvs update: ignoring newdir (CVS/Entries missing)
PASS: conflicts3-19
cvs update: ignoring first-dir/newdir (CVS/Entries missing)
PASS: conflicts3-20
PASS: conflicts3-20a
U sdir/sfile
PASS: conflicts3-21
? sdir
PASS: conflicts3-22
? sdir
PASS: conflicts3-23
U sdir/sfile
PASS: conflicts3-24
cvs remove: scheduling `sdir/sfile' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: conflicts3-25
Removing sdir/sfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir/sfile,v  <--  sfile
new revision: delete; previous revision: 1.1
done
PASS: conflicts3-26
? sdir
PASS: conflicts3-27
? sdir
PASS: conflicts3-28
PASS: clean-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: clean-2
cvs add: scheduling file `cleanme.txt' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: clean-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/cleanme.txt,v
done
Checking in cleanme.txt;
/tmp/cvs-sanity/cvsroot/first-dir/cleanme.txt,v  <--  cleanme.txt
initial revision: 1.1
done
PASS: clean-4
PASS: clean-5
PASS: clean-6
M cleanme.txt
PASS: clean-7
(Locally modified cleanme.txt moved to .#cleanme.txt.1.1)
U cleanme.txt
PASS: clean-8
The usual boring test text.
fish
PASS: clean-9
PASS: clean-10
PASS: clean-11
M cleanme.txt
PASS: clean-12
(Locally modified cleanme.txt moved to .#cleanme.txt.1.1)
U cleanme.txt
PASS: clean-13
The usual boring test text.
bluegill
PASS: clean-14
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: modules-1
Checking in CVSROOT/modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.2; previous revision: 1.1
done
cvs commit: Rebuilding administrative file database
PASS: modules-1d
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: modules-2
Checking in CVSROOT/modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.3; previous revision: 1.2
done
cvs commit: Rebuilding administrative file database
PASS: modules-2d
PASS: modules-3
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: modules-3d
Checking in CVSROOT/modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.4; previous revision: 1.3
done
cvs commit: Rebuilding administrative file database
PASS: modules-3g
PASS: modules-143
Directory /tmp/cvs-sanity/cvsroot/first-dir/subdir added to the repository
PASS: modules-143a
Directory /tmp/cvs-sanity/cvsroot/first-dir/subdir/ssdir added to the repository
PASS: modules-143b
cvs add: scheduling file `a' for addition
cvs add: scheduling file `b' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: modules-144
cvs commit: Examining .
cvs commit: Examining ssdir
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/a,v
done
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/a,v  <--  a
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/b,v
done
Checking in b;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/b,v  <--  b
initial revision: 1.1
done
PASS: modules-145
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: modules-146
PASS: modules-147
Checking in CVSROOT/modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.5; previous revision: 1.4
done
cvs commit: Rebuilding administrative file database
PASS: modules-148
aliasmodule  -a first-dir/subdir/a
aliasnested  -a first-dir/subdir/ssdir
bogusalias   first-dir/subdir/a -a
dirmodule    first-dir/subdir
namedmodule  -d nameddir first-dir/subdir
realmodule   first-dir/subdir a
statusmod    -s Mungeable
topfiles     -a first-dir/file1 first-dir/file2
world        -a .
PASS: modules-148a0
statusmod    Mungeable  
bogusalias   NONE        first-dir/subdir/a -a
dirmodule    NONE        first-dir/subdir
namedmodule  NONE        first-dir/subdir
realmodule   NONE        first-dir/subdir a
PASS: modules-148a1
U realmodule/a
PASS: modules-149a1
PASS: modules-149a2
PASS: modules-149a3
PASS: modules-149a4
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `realmodule': PASS: 
modules-149a5
cvs checkout: module `realmodule/a' is a request for a file in a module which 
is not a directory
PASS: modules-149b1
U dirmodule/a
PASS: modules-150c
PASS: modules-150d
PASS: modules-150e
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `dirmodule': PASS: 
modules-150f
cvs checkout: warning: new-born dirmodule/nonexist has disappeared
PASS: modules-150g1
PASS: modules-150g2
U nameddir/a
U nameddir/b
PASS: modules-150h1
PASS: modules-150h2
M nameddir/a
PASS: modules-150h3
U nameddir/a
PASS: modules-150h4
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `nameddir': PASS: 
modules-150h99
PASS: modules-151
PASS: modules-152
M first-dir/subdir/a
PASS: modules-153
cvs checkout: Updating first-dir/subdir/ssdir
PASS: modules-155a0
PASS: modules-155a1
PASS: modules-155a2
PASS: modules-155a3
first-dir
PASS: modules-155a4
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
U first-dir/subdir/a
U first-dir/subdir/b
PASS: modules-155b
U first-dir/subdir/a
U first-dir/subdir/b
PASS: modules-155c1
cvs add: scheduling file `file1' for addition
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: modules-155c2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: modules-155c3
U first-dir/file1
U first-dir/file2
PASS: modules-155c4
PASS: modules-155c5
cvs remove: use 'cvs commit' to remove this file permanently
PASS: modules-155c6
Removing file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: delete; previous revision: 1.1
done
PASS: modules-155c7
cvs checkout: warning: first-dir/file1 is not (any longer) pertinent
U first-dir/file2
PASS: modules-155c8
PASS: modules2-setup-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
Directory /tmp/cvs-sanity/cvsroot/second-dir added to the repository
Directory /tmp/cvs-sanity/cvsroot/third-dir added to the repository
PASS: modules2-setup-2
cvs add: scheduling file `file3' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: modules2-setup-3
RCS file: /tmp/cvs-sanity/cvsroot/third-dir/file3,v
done
Checking in file3;
/tmp/cvs-sanity/cvsroot/third-dir/file3,v  <--  file3
initial revision: 1.1
done
PASS: modules2-setup-4
U CVSROOT/modules
PASS: modules2-1
Checking in modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.6; previous revision: 1.5
done
cvs commit: Rebuilding administrative file database
PASS: modules2-2
PASS: modules2-3
PASS: modules2-4
PASS: modules2-5
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `first-dir': You have 
[0] altered files in this repository.
Are you sure you want to release (and delete) directory `second-dir': PASS: 
modules2-6
PASS: modules2-7
PASS: modules2-8
cvs checkout: Updating first-dir
cvs checkout: Updating second-dir
PASS: modules2-9
cvs add: scheduling file `first-dir/amper1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: modules2-10
cvs checkout: Updating first-dir
A first-dir/amper1
cvs checkout: Updating second-dir
PASS: modules2-12
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/amper1,v
done
Checking in ampermodule/first-dir/amper1;
/tmp/cvs-sanity/cvsroot/first-dir/amper1,v  <--  amper1
initial revision: 1.1
done
PASS: modules2-13
U combmodule/file3
cvs checkout: Updating first-dir
U first-dir/amper1
PASS: modules2-14
PASS: modules2-15
PASS: modules2-16
cvs update: Updating .
PASS: modules2-17
U first-dir/amper1
PASS: modules2-18
PASS: modules2-19
cvs checkout: Updating first-dir
U first-dir/amper1
cvs checkout: Updating second-dir
PASS: modules2-20
PASS: modules2-21
cvs checkout: modules file missing directory for module badmod
PASS: modules2-22
U CVSROOT/modules
PASS: modules2-a0.5
Checking in modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.7; previous revision: 1.6
done
cvs commit: Rebuilding administrative file database
PASS: modules2-a0
cvs checkout: -a cannot be specified in the modules file along with other 
options
PASS: modules2-a1
PASS: modules3-0
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: modules3-1
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: modules3-2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: modules3-3
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: modules3-4
Checking in modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.8; previous revision: 1.7
done
cvs commit: Rebuilding administrative file database
PASS: modules3-5
PASS: modules3-6
U first-dir/file1
PASS: modules3-7
cvs import: Importing /tmp/cvs-sanity/cvsroot/second-dir/suba
cvs import: Importing /tmp/cvs-sanity/cvsroot/second-dir/suba/subb

No conflicts created by this import

PASS: modules3-7a
cvs checkout: Updating second-dir
cvs checkout: Updating second-dir/suba
cvs checkout: Updating second-dir/suba/subb
PASS: modules3-7b
cvs add: scheduling file `fileb' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: modules3-7c
RCS file: /tmp/cvs-sanity/cvsroot/second-dir/suba/subb/fileb,v
done
Checking in fileb;
/tmp/cvs-sanity/cvsroot/second-dir/suba/subb/fileb,v  <--  fileb
initial revision: 1.1
done
PASS: modules3-7d
U src/sub/dir/file1
PASS: modules3-8
PASS: modules3-9
U src/sub1/sub2/sub3/dir/file1
PASS: modules3-10
PASS: modules3-11
U first-dir/file1
PASS: modules3-12
PASS: modules3-13
PASS: modules3-14
PASS: modules3-15
U another/path/test/file1
PASS: modules3-16
file1
PASS: modules3-17
PASS: modules4-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: modules4-2
Directory /tmp/cvs-sanity/cvsroot/first-dir/subdir added to the repository
PASS: modules4-3
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: modules4-4
cvs add: scheduling file `subdir/file2' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: modules4-5
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/file2,v
done
Checking in subdir/file2;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/file2,v  <--  file2
initial revision: 1.1
done
PASS: modules4-6
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: modules4-7
Checking in modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.9; previous revision: 1.8
done
cvs commit: Rebuilding administrative file database
PASS: modules4-8
U first-dir/file1
U first-dir/subdir/file2
PASS: modules4-9
U first-dir/file1
PASS: modules4-10
PASS: modules4-11
U first-dir/file1
U first-dir/subdir/file2
PASS: modules4-11a
cvs rtag: Tagging first-dir
cvs rtag: Ignoring first-dir/subdir
PASS: modules4-12

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/file2,v
Working file: file2
head: 1.1
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 1;     selected revisions: 1
description:
----------------------------
revision 1.1
date: 2002/12/17 04:09:01;  author: nagle;  state: Exp;
add-it
=============================================================================
PASS: modules4-13
PASS: modules5-1
Directory /tmp/cvs-sanity/cvsroot/first-dir/subdir added to the repository
PASS: modules5-2
Directory /tmp/cvs-sanity/cvsroot/first-dir/subdir/ssdir added to the repository
PASS: modules5-3
cvs add: scheduling file `a' for addition
cvs add: scheduling file `b' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: modules5-4
cvs commit: Examining .
cvs commit: Examining ssdir
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/a,v
done
Checking in a;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/a,v  <--  a
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/b,v
done
Checking in b;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/b,v  <--  b
initial revision: 1.1
done
PASS: modules5-5
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: modules5-6
Checking in CVSROOT/modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.10; previous revision: 1.9
done
cvs commit: Rebuilding administrative file database
PASS: modules5-7
U realmodule/a
cvs checkout: Executing ''/tmp/cvs-sanity/cvsroot/checkout.sh' 'realmodule''
checkout script invoked in /tmp/cvs-sanity/1
args: realmodule
PASS: modules5-8
PASS: modules5-9
PASS: modules5-10
checkout script invoked in /tmp/cvs-sanity/1
args: realmodule
PASS: modules5-11
cvs update: Executing ''/tmp/cvs-sanity/cvsroot/update.sh' 
'/tmp/cvs-sanity/cvsroot/first-dir/subdir''
update script invoked in /tmp/cvs-sanity/1/realmodule
args: /tmp/cvs-sanity/cvsroot/first-dir/subdir
PASS: modules5-12
Checking in realmodule/a;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/a,v  <--  a
new revision: 1.2; previous revision: 1.1
done
cvs commit: Executing ''/tmp/cvs-sanity/cvsroot/checkin.sh' 
'/tmp/cvs-sanity/cvsroot/first-dir/subdir''
checkin script invoked in /tmp/cvs-sanity/1/realmodule
args: /tmp/cvs-sanity/cvsroot/first-dir/subdir
PASS: modules5-13
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `realmodule': PASS: 
modules5-14
tag script invoked in /tmp/cvs-sanity/1
args: realmodule MYTAG
PASS: modules5-15
U realmodule/a
export script invoked in /tmp/cvs-sanity/1
args: realmodule
PASS: modules5-16
cvs checkout: module `realmodule/a' is a request for a file in a module which 
is not a directory
PASS: modules5-17
U dirmodule/a
cvs checkout: Executing ''/tmp/cvs-sanity/cvsroot/checkout.sh' 'dirmodule''
checkout script invoked in /tmp/cvs-sanity/1
args: dirmodule
PASS: modules5-18
PASS: modules5-19
PASS: modules5-20
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `dirmodule': PASS: 
modules5-21
cvs checkout: warning: new-born dirmodule/nonexist has disappeared
cvs checkout: Executing ''/tmp/cvs-sanity/cvsroot/checkout.sh' 'dirmodule''
checkout script invoked in /tmp/cvs-sanity/1
args: dirmodule
PASS: modules5-22
PASS: modules5-23
U nameddir/a
U nameddir/b
checkout script invoked in /tmp/cvs-sanity/1
args: nameddir
PASS: modules5-24
PASS: modules5-25
M nameddir/a
cvs checkout: Executing ''/tmp/cvs-sanity/cvsroot/update.sh' 
'/tmp/cvs-sanity/cvsroot/first-dir/subdir''
update script invoked in /tmp/cvs-sanity/1/nameddir
args: /tmp/cvs-sanity/cvsroot/first-dir/subdir
checkout script invoked in /tmp/cvs-sanity/1
args: nameddir
PASS: modules5-26
U nameddir/a
cvs checkout: Executing ''/tmp/cvs-sanity/cvsroot/update.sh' 
'/tmp/cvs-sanity/cvsroot/first-dir/subdir''
update script invoked in /tmp/cvs-sanity/1/nameddir
args: /tmp/cvs-sanity/cvsroot/first-dir/subdir
checkout script invoked in /tmp/cvs-sanity/1
args: nameddir
PASS: modules5-27
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `nameddir': PASS: 
modules5-28
PASS: mtfr-1
Checking in checkoutlist;
/tmp/cvs-sanity/cvsroot/CVSROOT/checkoutlist,v  <--  checkoutlist
new revision: 1.2; previous revision: 1.1
done
cvs commit: Rebuilding administrative file database
PASS: mtfr-2
/tmp/cvs-sanity/cvsroot/CVSROOT/.#[0-9]*
PASS: mtfr-3
U CVSROOT/config
PASS: cvsadm-setup-1
Checking in config;
/tmp/cvs-sanity/cvsroot/CVSROOT/config,v  <--  config
new revision: 1.2; previous revision: 1.1
done
cvs commit: Rebuilding administrative file database
PASS: cvsadm-setup-2
U CVSROOT/modules
PASS: cvsadm-1
/tmp/cvs-sanity/cvsroot
PASS: cvsadm-1a
.
PASS: cvsadm-1b
/tmp/cvs-sanity/cvsroot
PASS: cvsadm-1c
CVSROOT
PASS: cvsadm-1d
cvs commit: Examining .
cvs commit: Examining CVSROOT
Checking in CVSROOT/modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.11; previous revision: 1.10
done
cvs commit: Rebuilding administrative file database
PASS: cvsadm-1e
PASS: cvsadm-2
Directory /tmp/cvs-sanity/cvsroot/mod1 added to the repository
Directory /tmp/cvs-sanity/cvsroot/mod1-2 added to the repository
Directory /tmp/cvs-sanity/cvsroot/mod2 added to the repository
Directory /tmp/cvs-sanity/cvsroot/mod2/sub2 added to the repository
Directory /tmp/cvs-sanity/cvsroot/mod2-2 added to the repository
Directory /tmp/cvs-sanity/cvsroot/mod2-2/sub2-2 added to the repository
PASS: cvsadm-2a
cvs add: scheduling file `mod1/file1' for addition
cvs add: scheduling file `mod1-2/file1-2' for addition
cvs add: scheduling file `mod2/sub2/file2' for addition
cvs add: scheduling file `mod2-2/sub2-2/file2-2' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: cvsadm-2aa
cvs commit: Examining mod1
cvs commit: Examining mod1-2
cvs commit: Examining mod2
cvs commit: Examining mod2/sub2
cvs commit: Examining mod2-2
cvs commit: Examining mod2-2/sub2-2
RCS file: /tmp/cvs-sanity/cvsroot/mod1/file1,v
done
Checking in mod1/file1;
/tmp/cvs-sanity/cvsroot/mod1/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/mod1-2/file1-2,v
done
Checking in mod1-2/file1-2;
/tmp/cvs-sanity/cvsroot/mod1-2/file1-2,v  <--  file1-2
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/mod2/sub2/file2,v
done
Checking in mod2/sub2/file2;
/tmp/cvs-sanity/cvsroot/mod2/sub2/file2,v  <--  file2
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/mod2-2/sub2-2/file2-2,v
done
Checking in mod2-2/sub2-2/file2-2;
/tmp/cvs-sanity/cvsroot/mod2-2/sub2-2/file2-2,v  <--  file2-2
initial revision: 1.1
done
PASS: cvsadm-2b
cvs checkout: Updating 1mod
U 1mod/file1
PASS: cvsadm-3
.
PASS: cvsadm-3b
mod1
PASS: cvsadm-3d
cvs checkout: Updating 2mod
U 2mod/file2
PASS: cvsadm-4
.
PASS: cvsadm-4b
mod2/sub2
PASS: cvsadm-4d
cvs checkout: Updating dir1d1
U dir1d1/file1
PASS: cvsadm-5
.
PASS: cvsadm-5b
mod1
PASS: cvsadm-5d
cvs checkout: Updating dir1d2
U dir1d2/file2
PASS: cvsadm-6
.
PASS: cvsadm-6b
mod2/sub2
PASS: cvsadm-6d
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
PASS: cvsadm-7
.
PASS: cvsadm-7b
CVSROOT/Emptydir
PASS: cvsadm-7d
mod1
PASS: cvsadm-7f
cvs checkout: Updating dir2d2/sub2d2
U dir2d2/sub2d2/file2
PASS: cvsadm-8
.
PASS: cvsadm-8b
CVSROOT/Emptydir
PASS: cvsadm-8d
mod2/sub2
PASS: cvsadm-8f
cvs checkout: Updating 1mod
U 1mod/file1
cvs checkout: Updating 1mod-2
U 1mod-2/file1-2
PASS: cvsadm-9
.
PASS: cvsadm-9b
mod1
PASS: cvsadm-9d
mod1-2
PASS: cvsadm-9f
cvs checkout: Updating 1mod
U 1mod/file1
cvs checkout: Updating 2mod
U 2mod/file2
PASS: cvsadm-10
.
PASS: cvsadm-10b
mod1
PASS: cvsadm-10d
mod2/sub2
PASS: cvsadm-10f
cvs checkout: Updating 1mod
U 1mod/file1
cvs checkout: Updating dir1d1
U dir1d1/file1
PASS: cvsadm-11
.
PASS: cvsadm-11b
mod1
PASS: cvsadm-11d
mod1
PASS: cvsadm-11f
cvs checkout: Updating 1mod
U 1mod/file1
cvs checkout: Updating dir1d2
U dir1d2/file2
PASS: cvsadm-12
.
PASS: cvsadm-12b
mod1
PASS: cvsadm-12d
mod2/sub2
PASS: cvsadm-12f
cvs checkout: Updating 1mod
U 1mod/file1
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
PASS: cvsadm-13
.
PASS: cvsadm-13b
mod1
PASS: cvsadm-13d
CVSROOT/Emptydir
PASS: cvsadm-13f
mod1
PASS: cvsadm-13h
cvs checkout: Updating 1mod
U 1mod/file1
cvs checkout: Updating dir2d2/sub2d2
U dir2d2/sub2d2/file2
PASS: cvsadm-14
.
PASS: cvsadm-14b
mod1
PASS: cvsadm-14d
CVSROOT/Emptydir
PASS: cvsadm-14f
mod2/sub2
PASS: cvsadm-14h
cvs checkout: Updating 2mod
U 2mod/file2
cvs checkout: Updating 2mod-2
U 2mod-2/file2-2
PASS: cvsadm-15
.
PASS: cvsadm-15b
mod2/sub2
PASS: cvsadm-15d
mod2-2/sub2-2
PASS: cvsadm-15f
cvs checkout: Updating 2mod
U 2mod/file2
cvs checkout: Updating dir1d1
U dir1d1/file1
PASS: cvsadm-16
.
PASS: cvsadm-16b
mod2/sub2
PASS: cvsadm-16d
mod1
PASS: cvsadm-16f
cvs checkout: Updating 2mod
U 2mod/file2
cvs checkout: Updating dir1d2
U dir1d2/file2
PASS: cvsadm-17
.
PASS: cvsadm-17b
mod2/sub2
PASS: cvsadm-17d
mod2/sub2
PASS: cvsadm-17f
cvs checkout: Updating 2mod
U 2mod/file2
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
PASS: cvsadm-18
.
PASS: cvsadm-18b
mod2/sub2
PASS: cvsadm-18d
CVSROOT/Emptydir
PASS: cvsadm-18f
mod1
PASS: cvsadm-18h
cvs checkout: Updating 2mod
U 2mod/file2
cvs checkout: Updating dir2d2/sub2d2
U dir2d2/sub2d2/file2
PASS: cvsadm-19
.
PASS: cvsadm-19b
mod2/sub2
PASS: cvsadm-19d
CVSROOT/Emptydir
PASS: cvsadm-19f
mod2/sub2
PASS: cvsadm-19h
cvs checkout: Updating dir1d1
U dir1d1/file1
cvs checkout: Updating dir1d1-2
U dir1d1-2/file1-2
PASS: cvsadm-20
.
PASS: cvsadm-20b
mod1
PASS: cvsadm-20d
mod1-2
PASS: cvsadm-20f
cvs checkout: Updating dir1d1
U dir1d1/file1
cvs checkout: Updating dir1d2
U dir1d2/file2
PASS: cvsadm-21
.
PASS: cvsadm-21b
mod1
PASS: cvsadm-21d
mod2/sub2
PASS: cvsadm-21f
cvs checkout: Updating dir1d1
U dir1d1/file1
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
PASS: cvsadm-22
.
PASS: cvsadm-22b
mod1
PASS: cvsadm-22d
CVSROOT/Emptydir
PASS: cvsadm-22f
mod1
PASS: cvsadm-22h
cvs checkout: Updating dir1d1
U dir1d1/file1
cvs checkout: Updating dir2d2/sub2d2
U dir2d2/sub2d2/file2
PASS: cvsadm-23
.
PASS: cvsadm-23b
mod1
PASS: cvsadm-23d
CVSROOT/Emptydir
PASS: cvsadm-23f
mod2/sub2
PASS: cvsadm-23h
cvs checkout: Updating dir1d2
U dir1d2/file2
cvs checkout: Updating dir1d2-2
U dir1d2-2/file2-2
PASS: cvsadm-24
.
PASS: cvsadm-24b
mod2/sub2
PASS: cvsadm-24d
mod2-2/sub2-2
PASS: cvsadm-24f
cvs checkout: Updating dir1d2
U dir1d2/file2
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
PASS: cvsadm-25
.
PASS: cvsadm-25b
mod2/sub2
PASS: cvsadm-25d
CVSROOT/Emptydir
PASS: cvsadm-25f
mod1
PASS: cvsadm-25h
cvs checkout: Updating dir1d2
U dir1d2/file2
cvs checkout: Updating dir2d2/sub2d2
U dir2d2/sub2d2/file2
PASS: cvsadm-26
.
PASS: cvsadm-26b
mod2/sub2
PASS: cvsadm-26d
CVSROOT/Emptydir
PASS: cvsadm-26f
mod2/sub2
PASS: cvsadm-26h
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
cvs checkout: Updating dir2d1-2/sub2d1-2
U dir2d1-2/sub2d1-2/file1-2
PASS: cvsadm-27
.
PASS: cvsadm-27b
CVSROOT/Emptydir
PASS: cvsadm-27d
mod1
PASS: cvsadm-27f
CVSROOT/Emptydir
PASS: cvsadm-27h
mod1-2
PASS: cvsadm-27j
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
cvs checkout: Updating dir2d2/sub2d2
U dir2d2/sub2d2/file2
PASS: cvsadm-28
.
PASS: cvsadm-28b
CVSROOT/Emptydir
PASS: cvsadm-28d
mod1
PASS: cvsadm-28f
CVSROOT/Emptydir
PASS: cvsadm-28h
mod2/sub2
PASS: cvsadm-28j
cvs checkout: Updating dir2d2/sub2d2
U dir2d2/sub2d2/file2
cvs checkout: Updating dir2d2-2/sub2d2-2
U dir2d2-2/sub2d2-2/file2-2
PASS: cvsadm-29
.
PASS: cvsadm-29b
CVSROOT/Emptydir
PASS: cvsadm-29d
mod2/sub2
PASS: cvsadm-29f
CVSROOT/Emptydir
PASS: cvsadm-29h
mod2-2/sub2-2
PASS: cvsadm-29j
cvs checkout: Updating dir
U dir/file1
PASS: cvsadm-1d3
.
PASS: cvsadm-1d3b
mod1
PASS: cvsadm-1d3d
cvs checkout: Updating dir
U dir/file2
PASS: cvsadm-1d4
.
PASS: cvsadm-1d4b
mod2/sub2
PASS: cvsadm-1d4d
cvs checkout: Updating dir
U dir/file1
PASS: cvsadm-1d5
.
PASS: cvsadm-1d5b
mod1
PASS: cvsadm-1d5d
cvs checkout: Updating dir
U dir/file2
PASS: cvsadm-1d6
.
PASS: cvsadm-1d6b
mod2/sub2
PASS: cvsadm-1d6d
cvs checkout: Updating dir
U dir/file1
PASS: cvsadm-1d7
.
PASS: cvsadm-1d7b
mod1
PASS: cvsadm-1d7d
cvs checkout: Updating dir
U dir/file2
PASS: cvsadm-1d8
.
PASS: cvsadm-1d8b
mod2/sub2
PASS: cvsadm-1d8d
cvs checkout: Updating dir/1mod
U dir/1mod/file1
cvs checkout: Updating dir/1mod-2
U dir/1mod-2/file1-2
PASS: cvsadm-1d9
.
PASS: cvsadm-1d9b
.
PASS: cvsadm-1d9d
mod1
PASS: cvsadm-1d9f
mod1-2
PASS: cvsadm-1d9h
cvs checkout: Updating dir/1mod
U dir/1mod/file1
cvs checkout: Updating dir/2mod
U dir/2mod/file2
PASS: cvsadm-1d10
.
PASS: cvsadm-1d10b
.
PASS: cvsadm-1d10d
mod1
PASS: cvsadm-1d10f
mod2/sub2
PASS: cvsadm-1d10h
cvs checkout: Updating dir/1mod
U dir/1mod/file1
cvs checkout: Updating dir/dir1d1
U dir/dir1d1/file1
PASS: cvsadm-1d11
.
PASS: cvsadm-1d11b
.
PASS: cvsadm-1d11d
mod1
PASS: cvsadm-1d11f
mod1
PASS: cvsadm-1d11h
cvs checkout: Updating dir/1mod
U dir/1mod/file1
cvs checkout: Updating dir/dir1d2
U dir/dir1d2/file2
PASS: cvsadm-1d12
.
PASS: cvsadm-1d12b
.
PASS: cvsadm-1d12d
mod1
PASS: cvsadm-1d12f
mod2/sub2
PASS: cvsadm-1d12h
cvs checkout: Updating dir/1mod
U dir/1mod/file1
cvs checkout: Updating dir/dir2d1/sub2d1
U dir/dir2d1/sub2d1/file1
PASS: cvsadm-1d13
.
PASS: cvsadm-1d13b
.
PASS: cvsadm-1d13d
mod1
PASS: cvsadm-1d13f
CVSROOT/Emptydir
PASS: cvsadm-1d13h
mod1
PASS: cvsadm-1d13j
cvs checkout: Updating dir/1mod
U dir/1mod/file1
cvs checkout: Updating dir/dir2d2/sub2d2
U dir/dir2d2/sub2d2/file2
PASS: cvsadm-1d14
.
PASS: cvsadm-1d14b
.
PASS: cvsadm-1d14d
mod1
PASS: cvsadm-1d14f
CVSROOT/Emptydir
PASS: cvsadm-1d14h
mod2/sub2
PASS: cvsadm-1d14j
cvs checkout: Updating dir/2mod
U dir/2mod/file2
cvs checkout: Updating dir/2mod-2
U dir/2mod-2/file2-2
PASS: cvsadm-1d15
.
PASS: cvsadm-1d15b
.
PASS: cvsadm-1d15d
mod2/sub2
PASS: cvsadm-1d15f
mod2-2/sub2-2
PASS: cvsadm-1d15h
cvs checkout: Updating dir/2mod
U dir/2mod/file2
cvs checkout: Updating dir/dir1d1
U dir/dir1d1/file1
PASS: cvsadm-1d16
.
PASS: cvsadm-1d16b
.
PASS: cvsadm-1d16d
mod2/sub2
PASS: cvsadm-1d16f
mod1
PASS: cvsadm-1d16h
cvs checkout: Updating dir/2mod
U dir/2mod/file2
cvs checkout: Updating dir/dir1d2
U dir/dir1d2/file2
PASS: cvsadm-1d17
.
PASS: cvsadm-1d17b
.
PASS: cvsadm-1d17d
mod2/sub2
PASS: cvsadm-1d17f
mod2/sub2
PASS: cvsadm-1d17h
cvs checkout: Updating dir/2mod
U dir/2mod/file2
cvs checkout: Updating dir/dir2d1/sub2d1
U dir/dir2d1/sub2d1/file1
PASS: cvsadm-1d18
.
PASS: cvsadm-1d18b
.
PASS: cvsadm-1d18d
mod2/sub2
PASS: cvsadm-1d18f
CVSROOT/Emptydir
PASS: cvsadm-1d18h
mod1
PASS: cvsadm-1d18j
cvs checkout: Updating dir/2mod
U dir/2mod/file2
cvs checkout: Updating dir/dir2d2/sub2d2
U dir/dir2d2/sub2d2/file2
PASS: cvsadm-1d19
.
PASS: cvsadm-1d19b
.
PASS: cvsadm-1d19d
mod2/sub2
PASS: cvsadm-1d19f
CVSROOT/Emptydir
PASS: cvsadm-1d19h
mod2/sub2
PASS: cvsadm-1d19j
cvs checkout: Updating dir/dir1d1
U dir/dir1d1/file1
cvs checkout: Updating dir/dir1d1-2
U dir/dir1d1-2/file1-2
PASS: cvsadm-1d20
.
PASS: cvsadm-1d20b
.
PASS: cvsadm-1d20d
mod1
PASS: cvsadm-1d20f
mod1-2
PASS: cvsadm-1d20h
cvs checkout: Updating dir/dir1d1
U dir/dir1d1/file1
cvs checkout: Updating dir/dir1d2
U dir/dir1d2/file2
PASS: cvsadm-1d21
.
PASS: cvsadm-1d21b
.
PASS: cvsadm-1d21d
mod1
PASS: cvsadm-1d21f
mod2/sub2
PASS: cvsadm-1d21h
cvs checkout: Updating dir/dir1d1
U dir/dir1d1/file1
cvs checkout: Updating dir/dir2d1/sub2d1
U dir/dir2d1/sub2d1/file1
PASS: cvsadm-1d22
.
PASS: cvsadm-1d22b
.
PASS: cvsadm-1d22d
mod1
PASS: cvsadm-1d22f
CVSROOT/Emptydir
PASS: cvsadm-1d22h
mod1
PASS: cvsadm-1d22j
cvs checkout: Updating dir/dir1d1
U dir/dir1d1/file1
cvs checkout: Updating dir/dir2d2/sub2d2
U dir/dir2d2/sub2d2/file2
PASS: cvsadm-1d23
.
PASS: cvsadm-1d23b
.
PASS: cvsadm-1d23d
mod1
PASS: cvsadm-1d23f
CVSROOT/Emptydir
PASS: cvsadm-1d23h
mod2/sub2
PASS: cvsadm-1d23j
cvs checkout: Updating dir/dir1d2
U dir/dir1d2/file2
cvs checkout: Updating dir/dir1d2-2
U dir/dir1d2-2/file2-2
PASS: cvsadm-1d24
.
PASS: cvsadm-1d24b
.
PASS: cvsadm-1d24d
mod2/sub2
PASS: cvsadm-1d24f
mod2-2/sub2-2
PASS: cvsadm-1d24h
cvs checkout: Updating dir/dir1d2
U dir/dir1d2/file2
cvs checkout: Updating dir/dir2d1/sub2d1
U dir/dir2d1/sub2d1/file1
PASS: cvsadm-1d25
.
PASS: cvsadm-1d25b
.
PASS: cvsadm-1d25d
mod2/sub2
PASS: cvsadm-1d25f
CVSROOT/Emptydir
PASS: cvsadm-1d25h
mod1
PASS: cvsadm-1d25j
cvs checkout: Updating dir/dir1d2
U dir/dir1d2/file2
cvs checkout: Updating dir/dir2d2/sub2d2
U dir/dir2d2/sub2d2/file2
PASS: cvsadm-1d26
.
PASS: cvsadm-1d26b
.
PASS: cvsadm-1d26d
mod2/sub2
PASS: cvsadm-1d26f
CVSROOT/Emptydir
PASS: cvsadm-1d26h
mod2/sub2
PASS: cvsadm-1d26j
cvs checkout: Updating dir/dir2d1/sub2d1
U dir/dir2d1/sub2d1/file1
cvs checkout: Updating dir/dir2d1-2/sub2d1-2
U dir/dir2d1-2/sub2d1-2/file1-2
PASS: cvsadm-1d27
.
PASS: cvsadm-1d27b
.
PASS: cvsadm-1d27d
CVSROOT/Emptydir
PASS: cvsadm-1d27f
mod1
PASS: cvsadm-1d27h
CVSROOT/Emptydir
PASS: cvsadm-1d27j
mod1-2
PASS: cvsadm-1d27l
cvs checkout: Updating dir/dir2d1/sub2d1
U dir/dir2d1/sub2d1/file1
cvs checkout: Updating dir/dir2d2/sub2d2
U dir/dir2d2/sub2d2/file2
PASS: cvsadm-1d28
.
PASS: cvsadm-1d28b
.
PASS: cvsadm-1d28d
CVSROOT/Emptydir
PASS: cvsadm-1d28f
mod1
PASS: cvsadm-1d28h
CVSROOT/Emptydir
PASS: cvsadm-1d28j
mod2/sub2
PASS: cvsadm-1d28l
cvs checkout: Updating dir/dir2d2/sub2d2
U dir/dir2d2/sub2d2/file2
cvs checkout: Updating dir/dir2d2-2/sub2d2-2
U dir/dir2d2-2/sub2d2-2/file2-2
PASS: cvsadm-1d29
.
PASS: cvsadm-1d29b
.
PASS: cvsadm-1d29d
CVSROOT/Emptydir
PASS: cvsadm-1d29f
mod2/sub2
PASS: cvsadm-1d29h
CVSROOT/Emptydir
PASS: cvsadm-1d29j
mod2-2/sub2-2
PASS: cvsadm-1d29l
cvs checkout: cannot chdir to dir: No such file or directory
cvs checkout: ignoring module 1mod
PASS: cvsadm-2d3-1
cvs checkout: Updating dir/dir2
U dir/dir2/file1
PASS: cvsadm-2d3
.
PASS: cvsadm-2d3b
PASS: cvsadm-2d3d
mod1
PASS: cvsadm-2d3f
cvs checkout: Updating dir/dir2
U dir/dir2/file2
PASS: cvsadm-2d4
.
PASS: cvsadm-2d4b
mod2/sub2
PASS: cvsadm-2d4f
cvs checkout: Updating dir/dir2
U dir/dir2/file1
PASS: cvsadm-2d5
.
PASS: cvsadm-2d5b
mod1
PASS: cvsadm-2d5f
cvs checkout: Updating dir/dir2
U dir/dir2/file2
PASS: cvsadm-2d6
.
PASS: cvsadm-2d6b
mod2/sub2
PASS: cvsadm-2d6f
cvs checkout: Updating dir/dir2
U dir/dir2/file1
PASS: cvsadm-2d7
.
PASS: cvsadm-2d7b
mod1
PASS: cvsadm-2d7f
cvs checkout: Updating dir/dir2
U dir/dir2/file2
PASS: cvsadm-2d8
.
PASS: cvsadm-2d8b
mod2/sub2
PASS: cvsadm-2d8f
cvs checkout: Updating 1mod
U 1mod/file1
PASS: cvsadm-N3
.
PASS: cvsadm-N3b
mod1
PASS: cvsadm-N3d
cvs checkout: Updating 2mod
U 2mod/file2
PASS: cvsadm-N4
.
PASS: cvsadm-N4b
mod2/sub2
PASS: cvsadm-N4d
cvs checkout: Updating dir1d1
U dir1d1/file1
PASS: cvsadm-N5
.
PASS: cvsadm-N5b
mod1
PASS: cvsadm-N5d
cvs checkout: Updating dir1d2
U dir1d2/file2
PASS: cvsadm-N6
.
PASS: cvsadm-N6b
mod2/sub2
PASS: cvsadm-N6d
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
PASS: cvsadm-N7
.
PASS: cvsadm-N7b
CVSROOT/Emptydir
PASS: cvsadm-N7d
mod1
PASS: cvsadm-N7f
cvs checkout: Updating dir2d2/sub2d2
U dir2d2/sub2d2/file2
PASS: cvsadm-N8
.
PASS: cvsadm-N8b
CVSROOT/Emptydir
PASS: cvsadm-N8d
mod2/sub2
PASS: cvsadm-N8f
cvs checkout: Updating dir/1mod
U dir/1mod/file1
PASS: cvsadm-N1d3
.
PASS: cvsadm-N1d3b
.
PASS: cvsadm-N1d3d
mod1
PASS: cvsadm-N1d3f
cvs checkout: Updating dir/2mod
U dir/2mod/file2
PASS: cvsadm-N1d4
.
PASS: cvsadm-N1d4b
.
PASS: cvsadm-N1d4d
mod2/sub2
PASS: cvsadm-N1d4f
cvs checkout: Updating dir/dir1d1
U dir/dir1d1/file1
PASS: cvsadm-N1d5
.
PASS: cvsadm-N1d5b
.
PASS: cvsadm-N1d5d
mod1
PASS: cvsadm-N1d5d
cvs checkout: Updating dir/dir1d2
U dir/dir1d2/file2
PASS: cvsadm-N1d6
.
PASS: cvsadm-N1d6b
.
PASS: cvsadm-N1d6d
mod2/sub2
PASS: cvsadm-N1d6f
cvs checkout: Updating dir/dir2d1/sub2d1
U dir/dir2d1/sub2d1/file1
PASS: cvsadm-N1d7
.
PASS: cvsadm-N1d7b
.
PASS: cvsadm-N1d7d
CVSROOT/Emptydir
PASS: cvsadm-N1d7f
mod1
PASS: cvsadm-N1d7h
cvs checkout: Updating dir/dir2d2/sub2d2
U dir/dir2d2/sub2d2/file2
PASS: cvsadm-N1d8
.
PASS: cvsadm-N1d8b
.
PASS: cvsadm-N1d8d
CVSROOT/Emptydir
PASS: cvsadm-N1d8d
mod2/sub2
PASS: cvsadm-N1d8d
cvs checkout: Updating dir/dir2/1mod
U dir/dir2/1mod/file1
PASS: cvsadm-N2d3
.
PASS: cvsadm-N2d3b
.
PASS: cvsadm-N2d3f
mod1
PASS: cvsadm-N2d3h
cvs checkout: Updating dir/dir2/2mod
U dir/dir2/2mod/file2
PASS: cvsadm-N2d4
.
PASS: cvsadm-N2d4b
.
PASS: cvsadm-N2d4f
mod2/sub2
PASS: cvsadm-N2d4h
cvs checkout: Updating dir/dir2/dir1d1
U dir/dir2/dir1d1/file1
PASS: cvsadm-N2d5
.
PASS: cvsadm-N2d5b
.
PASS: cvsadm-N2d5f
mod1
PASS: cvsadm-N2d5h
cvs checkout: Updating dir/dir2/dir1d2
U dir/dir2/dir1d2/file2
PASS: cvsadm-N2d6
.
PASS: cvsadm-N2d6b
.
PASS: cvsadm-N2d6f
mod2/sub2
PASS: cvsadm-N2d6h
cvs checkout: Updating dir/dir2/dir2d1/sub2d1
U dir/dir2/dir2d1/sub2d1/file1
PASS: cvsadm-N2d7
.
PASS: cvsadm-N2d7b
.
PASS: cvsadm-N2d7f
CVSROOT/Emptydir
PASS: cvsadm-N2d7f
mod1
PASS: cvsadm-N2d7h
cvs checkout: Updating dir/dir2/dir2d2/sub2d2
U dir/dir2/dir2d2/sub2d2/file2
PASS: cvsadm-N2d8
.
PASS: cvsadm-N2d8b
.
PASS: cvsadm-N2d8f
CVSROOT/Emptydir
PASS: cvsadm-N2d8h
mod2/sub2
PASS: cvsadm-N2d8j
U CVSROOT/config
PASS: cvsadm-cleanup-1
Checking in config;
/tmp/cvs-sanity/cvsroot/CVSROOT/config,v  <--  config
new revision: 1.3; previous revision: 1.2
done
cvs commit: Rebuilding administrative file database
PASS: cvsadm-cleanup-2
U CVSROOT/modules
PASS: emptydir-1
cvs commit: Examining CVSROOT
Checking in CVSROOT/modules;
/tmp/cvs-sanity/cvsroot/CVSROOT/modules,v  <--  modules
new revision: 1.12; previous revision: 1.11
done
cvs commit: Rebuilding administrative file database
PASS: emptydir-2
PASS: emptydir-3
cvs checkout: Updating mod1
cvs checkout: Updating moda
PASS: emptydir-3a
Directory /tmp/cvs-sanity/cvsroot/moda/modasub added to the repository
PASS: emptydir-3b
cvs add: scheduling file `mod1/file1' for addition
cvs add: scheduling file `moda/modasub/filea' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: emptydir-4
RCS file: /tmp/cvs-sanity/cvsroot/mod1/file1,v
done
Checking in mod1/file1;
/tmp/cvs-sanity/cvsroot/mod1/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/moda/modasub/filea,v
done
Checking in moda/modasub/filea;
/tmp/cvs-sanity/cvsroot/moda/modasub/filea,v  <--  filea
initial revision: 1.1
done
PASS: emptydir-5
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
PASS: emptydir-6
cvs [add aborted]: cannot add to /tmp/cvs-sanity/cvsroot/CVSROOT/Emptydir
PASS: emptydir-7
cvs [add aborted]: cannot add to /tmp/cvs-sanity/cvsroot/CVSROOT/Emptydir
PASS: emptydir-8
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: emptydir-9
PASS: emptydir-10
PASS: emptydir-11
U dir2d1/suba/filea
PASS: emptydir-12
CVSROOT/Emptydir
PASS: emptydir-13
cvs checkout: Updating dir2d1/sub2d1
U dir2d1/sub2d1/file1
cvs checkout: Updating dir2d1/suba
PASS: emptydir-14
CVSROOT/Emptydir
PASS: emptydir-15
cvs checkout: Updating mod1
cvs checkout: Updating mod2
PASS: abspath-1a
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: abspath-1ba
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: abspath-1bb
cvs commit: Examining mod1
cvs commit: Examining mod2
RCS file: /tmp/cvs-sanity/cvsroot/mod1/file1,v
done
Checking in mod1/file1;
/tmp/cvs-sanity/cvsroot/mod1/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/mod2/file2,v
done
Checking in mod2/file2;
/tmp/cvs-sanity/cvsroot/mod2/file2,v  <--  file2
initial revision: 1.1
done
PASS: abspath-1c
cvs checkout: Updating /tmp/cvs-sanity/1
U /tmp/cvs-sanity/1/file1
PASS: abspath-2a
mod1
PASS: abspath-2b
cvs checkout: cannot chdir to 1: No such file or directory
cvs checkout: ignoring module mod1
PASS: abspath-3.1
cvs checkout: cannot chdir to 1: No such file or directory
cvs checkout: ignoring module mod1
PASS: abspath-3.2
cvs checkout: Updating /tmp/cvs-sanity/1/2
U /tmp/cvs-sanity/1/2/file1
PASS: abspath-3a
mod1
PASS: abspath-3b
PASS: abspath-3c
cvs [checkout aborted]: cannot make directory sub: No such file or directory
PASS: abspath-4
cvs checkout: Updating /tmp/cvs-sanity/1/mod1
U /tmp/cvs-sanity/1/mod1/file1
cvs checkout: Updating /tmp/cvs-sanity/1/mod2
U /tmp/cvs-sanity/1/mod2/file2
PASS: abspath-5a
.
PASS: abspath-5b
mod1
PASS: abspath-5c
mod2
PASS: abspath-5d
cvs checkout: Updating /tmp/cvs-sanity/1
cvs checkout: Updating /tmp/cvs-sanity/1/CVSROOT
U /tmp/cvs-sanity/1/CVSROOT/checkoutlist
U /tmp/cvs-sanity/1/CVSROOT/commitinfo
U /tmp/cvs-sanity/1/CVSROOT/config
U /tmp/cvs-sanity/1/CVSROOT/cvswrappers
U /tmp/cvs-sanity/1/CVSROOT/editinfo
U /tmp/cvs-sanity/1/CVSROOT/loginfo
U /tmp/cvs-sanity/1/CVSROOT/modules
U /tmp/cvs-sanity/1/CVSROOT/notify
U /tmp/cvs-sanity/1/CVSROOT/rcsinfo
U /tmp/cvs-sanity/1/CVSROOT/taginfo
U /tmp/cvs-sanity/1/CVSROOT/verifymsg
cvs checkout: Updating /tmp/cvs-sanity/1/mod1
U /tmp/cvs-sanity/1/mod1/file1
cvs checkout: Updating /tmp/cvs-sanity/1/mod2
U /tmp/cvs-sanity/1/mod2/file2
PASS: abspath-6a
.
PASS: abspath-6b
CVSROOT
PASS: abspath-6c
mod1
PASS: abspath-6c
mod2
PASS: abspath-6d
U /tmp/cvs-sanity/2/file2
PASS: abspath-7a
PASS: abspath-7b
U mod1/file1
PASS: abspath-7c
U /tmp/cvs-sanity/3/file2
PASS: abspath-7d
PASS: abspath-7e
U CVSROOT/config
PASS: toplevel-1a
Checking in config;
/tmp/cvs-sanity/cvsroot/CVSROOT/config,v  <--  config
new revision: 1.4; previous revision: 1.3
done
cvs commit: Rebuilding administrative file database
PASS: toplevel-1b
PASS: toplevel-1
Directory /tmp/cvs-sanity/cvsroot/top-dir added to the repository
Directory /tmp/cvs-sanity/cvsroot/second-dir added to the repository
PASS: toplevel-2
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: toplevel-3
RCS file: /tmp/cvs-sanity/cvsroot/top-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/top-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: toplevel-4
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: toplevel-3s
RCS file: /tmp/cvs-sanity/cvsroot/second-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/second-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: toplevel-4s
cvs checkout: Updating top-dir
U top-dir/file1
PASS: toplevel-5
cvs update: Updating top-dir
PASS: toplevel-6
cvs update: Updating .
cvs update: Updating top-dir
PASS: toplevel-7
cvs update: Updating top-dir
PASS: toplevel-8
cvs update: Updating .
cvs update: Updating CVSROOT
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
cvs update: Updating second-dir
U second-dir/file2
cvs update: Updating top-dir
PASS: toplevel-9
cvs checkout: Updating top-dir
U top-dir/file1
PASS: toplevel-10
U second-dir/file2
PASS: toplevel-11
cvs checkout: warning: cannot make directory CVS in .: Permission denied
cvs checkout: Updating top-dir
PASS: toplevel-12
U CVSROOT/config
PASS: toplevel-cleanup-1
Checking in config;
/tmp/cvs-sanity/cvsroot/CVSROOT/config,v  <--  config
new revision: 1.5; previous revision: 1.4
done
cvs commit: Rebuilding administrative file database
PASS: toplevel-cleanup-2
U CVSROOT/config
PASS: toplevel2-1a
Checking in config;
/tmp/cvs-sanity/cvsroot/CVSROOT/config,v  <--  config
new revision: 1.6; previous revision: 1.5
done
cvs commit: Rebuilding administrative file database
PASS: toplevel2-1b
PASS: toplevel2-1
Directory /tmp/cvs-sanity/cvsroot/top-dir added to the repository
Directory /tmp/cvs-sanity/cvsroot/second-dir added to the repository
PASS: toplevel2-2
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: toplevel2-3
RCS file: /tmp/cvs-sanity/cvsroot/top-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/top-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: toplevel2-4
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: toplevel2-3s
RCS file: /tmp/cvs-sanity/cvsroot/second-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/second-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: toplevel2-4s
cvs checkout: Updating top-dir
U top-dir/file1
PASS: toplevel2-5
cvs update: Updating top-dir
PASS: toplevel2-6
cvs update: Updating top-dir
PASS: toplevel2-7
cvs update: Updating top-dir
PASS: toplevel2-8
cvs update: Updating top-dir
PASS: toplevel2-9
cvs checkout: Updating top-dir
U top-dir/file1
PASS: toplevel2-10
PASS: toplevel2-11
U CVSROOT/config
PASS: toplevel2-cleanup-1
Checking in config;
/tmp/cvs-sanity/cvsroot/CVSROOT/config,v  <--  config
new revision: 1.7; previous revision: 1.6
done
cvs commit: Rebuilding administrative file database
PASS: toplevel2-cleanup-2
N a-dir/test

No conflicts created by this import

PASS: 156
U a-dir/test

No conflicts created by this import

PASS: 157
cvs checkout: Updating a-dir
U a-dir/test
PASS: 158
cvs commit: Examining .
Checking in test;
/tmp/cvs-sanity/cvsroot/a-dir/test,v  <--  test
new revision: 1.2; previous revision: 1.1
done
PASS: 159
cvs remove: scheduling `test' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 160
cvs commit: Examining .
Removing test;
/tmp/cvs-sanity/cvsroot/a-dir/test,v  <--  test
new revision: delete; previous revision: 1.2
done
PASS: 161
N a-dir/test

No conflicts created by this import

PASS: 156
U a-dir/test

No conflicts created by this import

PASS: 157
cvs checkout: Updating a-dir
U a-dir/test
PASS: 158
cvs commit: Examining .
Checking in test;
/tmp/cvs-sanity/cvsroot/a-dir/test,v  <--  test
new revision: 1.2; previous revision: 1.1
done
PASS: 159
cvs remove: scheduling `test' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 160
cvs commit: Examining .
Removing test;
/tmp/cvs-sanity/cvsroot/a-dir/test,v  <--  test
new revision: delete; previous revision: 1.2
done
PASS: 161
N a-dir/test

No conflicts created by this import

PASS: 156
U a-dir/test

No conflicts created by this import

PASS: 157
cvs checkout: Updating a-dir
U a-dir/test
PASS: 158
cvs commit: Examining .
Checking in test;
/tmp/cvs-sanity/cvsroot/a-dir/test,v  <--  test
new revision: 1.2; previous revision: 1.1
done
PASS: 159
cvs remove: scheduling `test' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 160
cvs commit: Examining .
Removing test;
/tmp/cvs-sanity/cvsroot/a-dir/test,v  <--  test
new revision: delete; previous revision: 1.2
done
PASS: 161
N a-dir/test

No conflicts created by this import

PASS: 156
U a-dir/test

No conflicts created by this import

PASS: 157
cvs checkout: Updating a-dir
U a-dir/test
PASS: 158
cvs commit: Examining .
Checking in test;
/tmp/cvs-sanity/cvsroot/a-dir/test,v  <--  test
new revision: 1.2; previous revision: 1.1
done
PASS: 159
cvs remove: scheduling `test' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 160
cvs commit: Examining .
Removing test;
/tmp/cvs-sanity/cvsroot/a-dir/test,v  <--  test
new revision: delete; previous revision: 1.2
done
PASS: 161
PASS: editor-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: editor-2
cvs add: scheduling file `file1' for addition
cvs add: scheduling file `file2' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: editor-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
done
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
initial revision: 1.1
done
PASS: editor-4
T file1
T file2
PASS: editor-5
PASS: editor-6
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: editor-7
U file1
PASS: editor-8
Checking in file2;
/tmp/cvs-sanity/cvsroot/first-dir/file2,v  <--  file2
new revision: 1.1.2.1; previous revision: 1.1
done
PASS: editor-9

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
Working file: file1
head: 1.1
branch:
locks: strict
access list:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.1
date: 2002/12/17 04:13:04;  author: nagle;  state: Exp;
branches:  1.1.2;
x
xCVS: ----------------------------------------------------------------------
xCVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
xCVS:
xCVS: Committing in .
xCVS:
xCVS: Added Files:
xCVS:   file1 file2
xCVS: ----------------------------------------------------------------------
----------------------------
revision 1.1.2.1
date: 2002/12/17 04:13:06;  author: nagle;  state: Exp;  lines: +1 -0
x
xCVS: ----------------------------------------------------------------------
xCVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
xCVS:
xCVS: Committing in .
xCVS:
xCVS: Modified Files:
xCVS:  Tag: br
xCVS:   file1
xCVS: ----------------------------------------------------------------------
=============================================================================
PASS: editor-log-file1

RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file2,v
Working file: file2
head: 1.1
branch:
locks: strict
access list:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.1
date: 2002/12/17 04:13:04;  author: nagle;  state: Exp;
branches:  1.1.2;
x
xCVS: ----------------------------------------------------------------------
xCVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
xCVS:
xCVS: Committing in .
xCVS:
xCVS: Added Files:
xCVS:   file1 file2
xCVS: ----------------------------------------------------------------------
----------------------------
revision 1.1.2.1
date: 2002/12/17 04:13:09;  author: nagle;  state: Exp;  lines: +1 -0
x
xCVS: ----------------------------------------------------------------------
xCVS: Enter Log.  Lines beginning with `CVS:' are removed automatically
xCVS:
xCVS: Modified Files:
xCVS:  Tag: br
xCVS:   file2
xCVS: ----------------------------------------------------------------------
=============================================================================
PASS: editor-log-file2
PASS: 162
cvs add: scheduling file `foo' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: 163
cvs commit: Examining .
RCS file: /tmp/cvs-sanity/cvsroot/1dir/foo,v
done
Checking in foo;
/tmp/cvs-sanity/cvsroot/1dir/foo,v  <--  foo
initial revision: 1.1
done
PASS: 164
U 1dir/foo
PASS: 165
cvs remove: scheduling `foo' for removal
cvs remove: use 'cvs commit' to remove this file permanently
PASS: 166
cvs commit: Examining .
Removing foo;
/tmp/cvs-sanity/cvsroot/1dir/foo,v  <--  foo
new revision: delete; previous revision: 1.1
done
PASS: 167
cvs [update aborted]: cannot rename file foo to CVS/,,foo: Permission denied
PASS: 168
PASS: errmsg2-1
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: errmsg2-2
cvs add: cannot add special file `CVS'; skipping
PASS: errmsg2-3
cvs add: cannot add special file `CVS'; skipping
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: errmsg2-4
cvs add: cannot add special file `.'; skipping
PASS: errmsg2-5
cvs add: cannot add special file `..'; skipping
PASS: errmsg2-6
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: errmsg2-7
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir added to the repository
PASS: errmsg2-8
cvs commit: nothing known about `nonexistant'
cvs [commit aborted]: correct above errors first!
PASS: errmsg2-8a
cvs commit: nothing known about `nonexistant'
cvs [commit aborted]: correct above errors first!
PASS: errmsg2-8b
PASS: errmsg2-8c
cvs add: scheduling file `file10' for addition
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir10 added to the repository
cvs add: use 'cvs commit' to add this file permanently
PASS: errmsg2-10
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file10,v
done
Checking in file10;
/tmp/cvs-sanity/cvsroot/first-dir/file10,v  <--  file10
initial revision: 1.1
done
PASS: errmsg2-11
PASS: errmsg2-12
Directory /tmp/cvs-sanity/cvsroot/first-dir/sdir10/ssdir added to the repository
PASS: errmsg2-13
cvs add: scheduling file `first-dir/sdir10/ssdir/ssfile' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: errmsg2-14
cvs add: scheduling file `first-dir/file15' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: errmsg2-15
cvs add: in directory bogus-dir:
cvs [add aborted]: there is no version here; do 'cvs checkout' first
PASS: errmsg2-16
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file15,v
done
Checking in first-dir/file15;
/tmp/cvs-sanity/cvsroot/first-dir/file15,v  <--  file15
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/sdir10/ssdir/ssfile,v
done
Checking in first-dir/sdir10/ssdir/ssfile;
/tmp/cvs-sanity/cvsroot/first-dir/sdir10/ssdir/ssfile,v  <--  ssfile
initial revision: 1.1
done
PASS: errmsg2-17
PASS: errmsg2-18
cvs [annotate aborted]: rcsbuf_open: internal error
PASS: errmsg2-19
cvs [import aborted]: attempt to import the repository
PASS: errmsg2-20
cvs [import aborted]: attempt to import the repository
PASS: errmsg2-21
PASS: 169
cvs add: scheduling file `abb' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: 170
cvs commit: Examining .
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/abb,v
done
Checking in abb;
/tmp/cvs-sanity/cvsroot/first-dir/abb,v  <--  abb
initial revision: 1.1
done
PASS: 171
Usage: cvs watch [on|off|add|remove] [-lR] [-a action] [files...]
on/off: turn on/off read-only checkouts of files
add/remove: add or remove notification on actions
-l (on/off/add/remove): Local directory only, not recursive
-R (on/off/add/remove): Process directories recursively
-a (add/remove): Specify what actions, one of
    edit,unedit,commit,all,none
(Specify the --help global option for a list of other help options)
PASS: 171a0
PASS: 172
cvs add: scheduling file `abc' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: 173
cvs commit: Examining .
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/abc,v
done
Checking in abc;
/tmp/cvs-sanity/cvsroot/first-dir/abc,v  <--  abc
initial revision: 1.1
done
PASS: 174
U first-dir/abb
U first-dir/abc
PASS: 175
PASS: 176
PASS: 177
PASS: devcom-178
PASS: 179
abb     nagle   Tue Dec 17 04:13:22 2002 GMT    qnx1    
/tmp/cvs-sanity/2/first-dir
PASS: devcom-180
Checking in abb;
/tmp/cvs-sanity/cvsroot/first-dir/abb,v  <--  abb
new revision: 1.2; previous revision: 1.1
done
PASS: 182
PASS: 182.5
PASS: devcom-183
PASS: 185
PASS: 186a1
PASS: 186a2
PASS: 186a3
abc has been modified; revert changes? PASS: 186a4
PASS: 186a5
abc has been modified; revert changes? PASS: 186a6
PASS: 186a7
PASS: devcom-a0
PASS: devcom-a-nonexist
PASS: devcom-a1
abb     nagle   edit    unedit  commit
abc     nagle   edit    unedit  commit
PASS: devcom-a2
PASS: devcom-a3
abb     nagle   edit    commit
PASS: devcom-a4
T abb
T abc
PASS: devcom-t0
U first-dir/abb
PASS: devcom-t1
U first-dir/abb
U first-dir/abc
PASS: devcom-t2
U first-dir/abb
U first-dir/abc
PASS: devcom-t3
PASS: devcom-b0
PASS: devcom-b1
PASS: devcom-b2
PASS: devcom-some0
U first-dir/abb
U first-dir/abc
PASS: devcom-some1
PASS: devcom-some2
PASS: devcom-some3
PASS: devcom2-1
PASS: devcom2-2
cvs add: scheduling file `w1' for addition
cvs add: scheduling file `w2' for addition
cvs add: scheduling file `w3' for addition
cvs add: scheduling file `nw1' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: devcom2-3
PASS: devcom2-4
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/nw1,v
done
Checking in nw1;
/tmp/cvs-sanity/cvsroot/first-dir/nw1,v  <--  nw1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/w1,v
done
Checking in w1;
/tmp/cvs-sanity/cvsroot/first-dir/w1,v  <--  w1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/w2,v
done
Checking in w2;
/tmp/cvs-sanity/cvsroot/first-dir/w2,v  <--  w2
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/w3,v
done
Checking in w3;
/tmp/cvs-sanity/cvsroot/first-dir/w3,v  <--  w3
initial revision: 1.1
done
PASS: devcom2-5
PASS: devcom2-6
U first-dir/nw1
U first-dir/w1
U first-dir/w2
U first-dir/w3
PASS: devcom2-7
PASS: devcom2-8
PASS: devcom2-9
PASS: devcom2-10
PASS: devcom2-11
cvs edit: no such file w4; ignored
PASS: devcom2-12
PASS: devcom2-13
cvs edit: no such file w5; ignored
PASS: devcom2-14
PASS: devcom2-15
PASS: devcom2-16
Fw1     _watched=
Fw2     _watched=
Fw3     _watched=
Fnw1    _watched=
D       _watched=
PASS: devcom2-17
U first+dir/nw1
U first+dir/w1
U first+dir/w2
U first+dir/w3
PASS: devcom2-18
cvs [edit aborted]: current directory (/tmp/cvs-sanity/2/first+dir) contains an 
invalid character (+,>;=\t\n)
PASS: devcom2-19
Fw1     _watched=
Fw2     _watched=
Fw3     _watched=
Fnw1    _watched=
D       _watched=
PASS: devcom2-20
PASS: devcom3-1
cvs add: scheduling file `w1' for addition
cvs add: scheduling file `w2' for addition
cvs add: use 'cvs commit' to add these files permanently
PASS: devcom3-2
PASS: devcom3-3
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/w1,v
done
Checking in w1;
/tmp/cvs-sanity/cvsroot/first-dir/w1,v  <--  w1
initial revision: 1.1
done
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/w2,v
done
Checking in w2;
/tmp/cvs-sanity/cvsroot/first-dir/w2,v  <--  w2
initial revision: 1.1
done
PASS: devcom3-4
Fw1     _watched=
Fw2     _watched=
PASS: devcom3-5
PASS: devcom3-6
Fw2     _watched=
address@hidden@#=&
Enew    line    here
PASS: devcom3-7
PASS: devcom3-8
Fw2     _watched=
Fw1     _watched=
Enew    line    here
address@hidden@#=&
PASS: devcom3-9
cvs [checkout aborted]: file attribute database corruption: tab missing in 
/tmp/cvs-sanity/cvsroot/first-dir/CVS/fileattr
PASS: devcom3-10
PASS: watch4-0a
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: watch4-0b
PASS: watch4-1
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: watch4-2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: watch4-3
Directory /tmp/cvs-sanity/cvsroot/first-dir/subdir added to the repository
PASS: watch4-4
cvs add: scheduling file `sfile' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: watch4-5
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/subdir/sfile,v
done
Checking in sfile;
/tmp/cvs-sanity/cvsroot/first-dir/subdir/sfile,v  <--  sfile
initial revision: 1.1
done
PASS: watch4-6
U first-dir/file1
U first-dir/subdir/sfile
PASS: watch4-7
PASS: watch4-8
PASS: watch4-9
PASS: watch4-10
PASS: watch4-11
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
new revision: 1.2; previous revision: 1.1
done
PASS: watch4-12
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
retrieving revision 1.1
retrieving revision 1.2
Merging differences between 1.1 and 1.2 into file1
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in file1
C file1
PASS: watch4-13
file1 has been modified; revert changes? PASS: watch4-14
PASS: watch4-16
U file1
PASS: watch4-17
edited in 1
PASS: watch4-18
PASS: watch4-cleanup-1
PASS: watch4-cleanup-1
PASS: watch5-0a
Directory /tmp/cvs-sanity/cvsroot/first-dir added to the repository
PASS: watch5-0b
PASS: watch5-1
cvs add: scheduling file `file1' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: watch5-2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/file1,v
done
Checking in file1;
/tmp/cvs-sanity/cvsroot/first-dir/file1,v  <--  file1
initial revision: 1.1
done
PASS: watch5-3
PASS: watch5-4
PASS: watch5-5
===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:13:44 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: watch5-6
PASS: watch5-7
===================================================================
File: file1             Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:13:44 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/file1,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

PASS: watch5-8
PASS: watch5-10
PASS: watch5-11
PASS: watch5-12
PASS: unedit-without-baserev-1
PASS: unedit-without-baserev-2
PASS: unedit-without-baserev-3
m has been modified; revert changes? cvs unedit: m not mentioned in CVS/Baserev
cvs unedit: run update to complete the unedit
PASS: unedit-without-baserev-4
/m/1.1.1.1/Tue Dec 17 04:13:46 2002//
D
PASS: unedit-without-baserev-5
cvs update: warning: m was lost
U m
PASS: unedit-without-baserev-6
PASS: unedit-without-baserev-7
PASS: unedit-without-baserev-10
PASS: unedit-without-baserev-11
Checking in m;
/tmp/cvs-sanity/cvsroot/x/m,v  <--  m
new revision: 1.2; previous revision: 1.1
done
PASS: unedit-without-baserev-12
RCS file: /tmp/cvs-sanity/cvsroot/x/m,v
retrieving revision 1.1.1.1
retrieving revision 1.2
Merging differences between 1.1.1.1 and 1.2 into m
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in m
C m
PASS: unedit-without-baserev-13
m has been modified; revert changes? cvs unedit: m not mentioned in CVS/Baserev
cvs unedit: run update to complete the unedit
PASS: unedit-without-baserev-14
cvs update: warning: m was lost
U m
PASS: unedit-without-baserev-15
edited in 1
PASS: unedit-without-baserev-16
PASS: unedit-without-baserev-17
edited in 1
PASS: unedit-without-baserev-18
U CVSROOT/checkoutlist
U CVSROOT/commitinfo
U CVSROOT/config
U CVSROOT/cvswrappers
U CVSROOT/editinfo
U CVSROOT/loginfo
U CVSROOT/modules
U CVSROOT/notify
U CVSROOT/rcsinfo
U CVSROOT/taginfo
U CVSROOT/verifymsg
PASS: 187a1
cvs add: scheduling file `cvsignore' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: 187a2
cvs commit: Examining .
RCS file: /tmp/cvs-sanity/cvsroot/CVSROOT/cvsignore,v
done
Checking in cvsignore;
/tmp/cvs-sanity/cvsroot/CVSROOT/cvsignore,v  <--  cvsignore
initial revision: 1.1
done
cvs commit: Rebuilding administrative file database
PASS: 187a3
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `CVSROOT': PASS: 187a4


I first-dir/defig.o
I first-dir/envig.c
I first-dir/optig.c
I first-dir/rootig.c
N first-dir/bar.c
N first-dir/foobar.c
No conflicts created by this import
PASS: 188a


N second-dir/bar.c
N second-dir/defig.o
N second-dir/envig.c
N second-dir/foobar.c
N second-dir/optig.c
N second-dir/rootig.c
No conflicts created by this import
PASS: 188b
U second-dir/bar.c
U second-dir/defig.o
U second-dir/envig.c
U second-dir/foobar.c
U second-dir/optig.c
U second-dir/rootig.c
PASS: 189a
U first-dir/bar.c
U first-dir/foobar.c
PASS: 189b
? notig.c
PASS: 189c
? defig.o
? envig.c
? notig.c
? optig.c
? rootig.c
PASS: 189d
? first-dir/.cvsignore
? second-dir/.cvsignore
? second-dir/notig.c
PASS: 190
? first-dir/.cvsignore
? first-dir/defig.o
? first-dir/envig.c
? first-dir/rootig.c
? second-dir/.cvsignore
? second-dir/notig.c
PASS: 191
? .cvsignore
You have [0] altered files in this repository.
Are you sure you want to release (and delete) directory `first-dir': PASS: 
ignore-192
M foobar.c
You have [1] altered files in this repository.
Are you sure you want to release (and delete) directory `second-dir': PASS: 
ignore-194
PASS: binfiles-1
cvs add: scheduling file `binfile' for addition
cvs add: use 'cvs commit' to add this file permanently
PASS: binfiles-2
RCS file: /tmp/cvs-sanity/cvsroot/first-dir/binfile,v
done
Checking in binfile;
/tmp/cvs-sanity/cvsroot/first-dir/binfile,v  <--  binfile
initial revision: 1.1
done
PASS: binfiles-3
U first-dir/binfile
PASS: binfiles-4
PASS: binfiles-5
===================================================================
File: binfile           Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:14:00 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/binfile,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      -kb

PASS: binfiles-5.5
U first-dir/binfile
PASS: binfiles-5.5b0
===================================================================
File: binfile           Status: Up-to-date

   Working revision:    1.1     Tue Dec 17 04:14:00 2002
   Repository revision: 1.1     /tmp/cvs-sanity/cvsroot/first-dir/binfile,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      -kb

PASS: binfiles-5.5b1
** expected: 
Checking in binfile;
/tmp/cvs-sanity/cvsroot/first-dir/binfile,v  <--  binfile
new revision: 1\.2; previous revision: 1\.1
done
** got: 
FAIL: binfiles-6

reply via email to

[Prev in Thread] Current Thread [Next in Thread]