This file created after sneaking ~/bde2alpha_rjl/bde/new_pr_util
in place of pr_util then restoring pr_util/CVS 
containing branch tag -Tbde2alpha_rv. then cvs update which
did not complain about rev nbrs, although the host dir'y ~/bde2alpha_rjl 
had an erroneous tag bde/CVS/Tag = -Nbde2alpha_rl.

Note that jkarner's rev#s are larger than lechner's.
I am afraid they may have been checked in on 
main branch since ~/bde2alpha_rjl has tag -Nbde2alpha_rl.

I have to thjink abot the best way to merge these together.
Perhaps I should use -j option to merge these into the main branch?
Or should I continue  with this brahch tagged -Tbde2alpha_rl?
I can't do either until a full build is tested.

-------------------------------

[saturn.cs.uml.edu1](241)> cvs diff pr_util > cvsdiff_new_pr_util.dif
cvs diff: Diffing pr_util
[saturn.cs.uml.edu1](242)> wc cvsdiff_new_pr_util.dif
        98       504      3866 cvsdiff_new_pr_util.dif
[saturn.cs.uml.edu1](243)> pwd; vi  cvsdiff_new_pr_util.dif
===============================================

Index: pr_util/Imakefile
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util/Imakefile,v
retrieving revision 1.4.2.7
diff -r1.4.2.7 Imakefile
3,15d2
<  * Revision 1.4.2.7  2000/09/26 02:17:03  lechner
<  * Third try at removing ALL the imbedded /* or */ brackets :-(
<  *
<  * Revision 1.4.2.6  2000/09/26 02:10:20  lechner
<  * I removed the SAME error from my previous Revision Comment :-)
<  *
<  * Revision 1.4.2.5  2000/09/26 02:03:22  lechner
<  * I removed this imbedded-comment error from Imakefile:
<  * 65:/_* -ansi sets cli_ansi in chgen.c to select # not /_*_*_/ and #fld not "fld"*_/
<  *
<  * Revision 1.4.2.4  2000/09/23 01:15:09  lechner
<  * Option -Wall added, option to use pre-genlog versions removed - RJL 2k0922
<  *
37c24
<  *Fixed # syntax error after cvs admin -c\ \_* Imakefile in this subdiry today.
---
>  *Fixed # syntax error after cvs admin -c\ \* Imakefile in this subdiry today.
71d57
< /* (NEW_VERSION flag is used in genv11/src/Makefile, not at runtime) */
73a60
> /* (NEW_VERSION flag is used in genv11/src/Makefile, not at runtime) */
75c62,63
< /* -ansi sets cli_ansi in chgen.c to select # not /_*_*_/ and #fld not "fld"*/
---
> GENFLAGS= -ansi  -metafile -log  -nobp
> /* -ansi sets cli_ansi in chgen.c to select # not /**/ and #fld not "fld"*/
79,80d66
< /* On bde2alpha_rv branch, ignore prior versions, use genv11 now- RJL 2k0922 */
< /* I added -DNEW_VERSION today - RJL 2k0402 : 		*/
82c68,79
< GENFLAGS= -ansi  -metafile -log  -nobp
---
> #ifdef GENV10
> GENSRCS = 		\
> 	pr_load.c 	\
> 	pr_free.c 	\
> 	pr_dump.c 	\
> 	pr_delete.c 
> GENOBJS =               \
>         pr_load.o       \
>         pr_free.o       \
>         pr_dump.o       \
>         pr_delete.o
> #else
96a94
> #endif
104d101
< 
Index: pr_util/pr_free.c
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util/Attic/pr_free.c,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 pr_free.c
35c35
< static char rcsid[] = "$Id: pr_free.c,v 1.1.2.1 2000/09/23 01:22:26 lechner Exp $";
---
> static char rcsid[] = "$Id: gen_pr_free.c,v 1.3.4.1 1999/05/04 16:59:55 jkarner Exp $";
Index: pr_util/pr_load.c
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util/Attic/pr_load.c,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 pr_load.c
67c67
< static char rcsid[] = "$Id: pr_load.c,v 1.1.2.1 2000/09/23 01:22:25 lechner Exp $";
---
> static char rcsid[] = "$Id: gen_pr_utils.c,v 1.3.4.2 1999/05/07 01:25:16 jkarner Exp $";
1654c1654
< static char rcsid[] = "$Id: pr_load.c,v 1.1.2.1 2000/09/23 01:22:25 lechner Exp $";
---
> static char rcsid[] = "$Id: gen_pr_init.c,v 1.4.4.2 1999/05/07 01:25:13 jkarner Exp $";
2933c2933
< static char rcsid[] = "$Id: pr_load.c,v 1.1.2.1 2000/09/23 01:22:25 lechner Exp $";
---
> static char rcsid[] = "$Id: gen_pr_load.c,v 1.4.4.2 1999/05/07 01:25:14 jkarner Exp $";
Index: pr_util/pr_log.c
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util/Attic/pr_log.c,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 pr_log.c
416c416
< static char rcsid[] = "$Id: pr_log.c,v 1.1.2.1 2000/09/23 01:22:27 lechner Exp $";
---
> static char rcsid[] = "$Id: gen_pr_log.c,v 1.2.4.1 1999/05/04 17:00:00 jkarner Exp $";
Index: pr_util/pr_stats.c
===================================================================
RCS file: /usr/proj3/case/95s523/95sbde/base/Master/bde/pr_util/Attic/pr_stats.c,v
retrieving revision 1.1.2.1
diff -r1.1.2.1 pr_stats.c
18c18
< static char rcsid[] = "$Id: pr_stats.c,v 1.1.2.1 2000/09/23 01:22:28 lechner Exp $";
---
> static char rcsid[] = "$Id: gen_pr_stats.c,v 1.2.4.1 1999/05/04 17:00:01 jkarner Exp $";