mercury.cs.uml.edu(84)> cat>aareadme_ver_11
-----------------------
I compared gen/ver_11 
	to gen/ver_11_link = $CASE/99s523/genmerge.
Result: only chgen/src/gen_defines.c has signif. (400 lines) diffs.
The local  ver_11  copy has 3-way unresolved cvs merge conflicts;
the $CASE/99s523/genmerge copy does not.
The tags are also different:
----------------
mercury.cs.uml.edu(173)> m  ../ver_11_link/chgenv11/chgen/CVS/Tag
Ttag01f522

mercury.cs.uml.edu(174)> pwd
/nfs/earth/misc/proj3/case/gen/ver_11
mercury.cs.uml.edu(175)> m chgen/CVS/Tag
Ngenv11
----------------
mercury.cs.uml.edu(204)> cvs status  ../ver_11_link/chgenv11/chgen/src/chgen.c
===================================================================
File: chgen.c           Status: Needs Patch

   Working revision:    1.4.4.2 Fri May  7 01:25:00 1999
   Repository revision: 1.4.4.2.2.1     /usr/proj3/case/gen/base/Master/chgen/src/chgen.c,v
   Sticky Tag:          tag01f522 (branch: 1.4.4.2.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

mercury.cs.uml.edu(205)> pwd
/nfs/earth/misc/proj3/case/gen/ver_11/
mercury.cs.uml.edu(206)> cvs status  chgen/src/chgen.c
===================================================================
File: chgen.c           Status: Locally Modified

   Working revision:    1.4.4.2 Tue Jul 18 23:02:22 2000
   Repository revision: 1.4.4.2 /usr/proj3/case/gen/base/Master/chgen/src/chgen.c,v
   Sticky Tag:          genv11 (revision: 1.4.4.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

mercury.cs.uml.edu(207)>

------------------------------------------
mercury.cs.uml.edu(86)> pwd
/nfs/earth/misc/proj3/case/gen/ver_11
mercury.cs.uml.edu(87)>
-----------------------
mercury.cs.uml.edu(80)> diff  ../ver_11_link/chgenv11/chgen chgen|wc
    176     979    7198
mercury.cs.uml.edu(81)> diff ../ver_11_link/chgenv11/chgen chgen | grepdiff
----------------
1:Only in chgen: .#aareadme.1.2
2:Only in chgen: .#aareadme.1.2.4.6
4:diff -bitw ../ver_11_link/chgenv11/chgen/aareadme chgen/aareadme
<BIG DIFF>
164:Only in ../ver_11_link/chgenv11/chgen: cvs.diff.011021
165:Only in ../ver_11_link/chgenv11/chgen: cvs.diff.2k0129
166:Only in ../ver_11_link/chgenv11/chgen: cvs.man
167:Only in chgen: cvsStatus050401.txt
168:Only in ../ver_11_link/chgenv11/chgen: cvsbranching.man
169:Only in ../ver_11_link/chgenv11/chgen: cvstagging.hlp
172:Only in chgen: genv11src.cvsstatus050324.txt
173:Only in chgen: mergeConflicts050401
----------------

mercury.cs.uml.edu(82)> diff ../ver_11_link/chgenv11/chgen/src chgen/src | grepdiff
-----------------
1:Only in chgen/src: .#gen_defines.c.1.7
2:Only in chgen/src: .#gen_defines.c.1.7.4.3
3:Only in chgen/src: .#gen_pr_load.c.1.4
4:Only in chgen/src: .#gen_pr_load.c.1.4.4.2
5:Only in chgen/src: .#gen_pr_log.c.1.2
6:Only in chgen/src: .#gen_pr_log.c.1.2.4.1
8:diff -bitw ../ver_11_link/chgenv11/chgen/src/aareadme chgen/src/aareadme
84:Only in ../ver_11_link/chgenv11/chgen/src: aareadme.2k0329
85:Only in ../ver_11_link/chgenv11/chgen/src: aareadme.990804
86:Only in chgen/src: chgen.970511
87:diff -bitw ../ver_11_link/chgenv11/chgen/src/chgen.c chgen/src/chgen.c
99:Only in chgen/src: gen+pr+loadTruncated.c
100:diff -bitw ../ver_11_link/chgenv11/chgen/src/gen_defines.c chgen/src/gen_defines.c
<BIG DIFF>
499:Only in chgen/src: gen_defines.new
500:Only in chgen/src: gen_pr_Updates.lst
501:Only in chgen/src: gen_pr_add.hlp
502:Only in chgen/src: gen_pr_add.new
503:Only in chgen/src: gen_pr_delete.new
504:diff -bitw ../ver_11_link/chgenv11/chgen/src/gen_pr_load.c chgen/src/gen_pr_load.c
550:Only in chgen/src: gen_pr_load.new
551:diff -bitw ../ver_11_link/chgenv11/chgen/src/gen_pr_log.c chgen/src/gen_pr_log.c
556:Only in chgen/src: gen_pr_utils.new
557:Only in ../ver_11_link/chgenv11/chgen/src: genv11.vs.genlog_branch.dif
558:Only in chgen/src: genv11Diffs.lst
559:Only in ../ver_11_link/chgenv11/chgen/src: metaschema.msdat
560:Only in chgen/src: pr_find_bt.dif
---------------
mercury.cs.uml.edu(83)> pwd
/nfs/earth/misc/proj3/case/gen/ver_11

=================================

The only <BIGDIFF> is in gen_defines.c (~ 400 line):
($CASE/gen/ver_11/chgen/src vs. 
 $CASE/gen/ver_11_link/chgenv11/chgen/src)
(Note the chgen merge conflicts (~7) pre-existing in  
$CASE/gen/ver_11chgen/src/gen_defines.c)

gen_defines.c itself has conflicts between -r 1.7 and -r 1.7.4.3

gen_pr_load.c itself has conflicts between -r 1.4 and -r 1.4.4.2.

diff -bitw ../ver_11_link/chgenv11/chgen/src/gen_defines.c chgen/src/gen_defines.c >>aareadme_ver_11
------------------

26a27,36
> <<<<<<< gen_defines.c
> <<<<<<< gen_defines.c
> /*               Apr26 1999 Hand merged ctwang updates of pr_set_key, pr_set_ */
> /*                          flt, pr_set_int, and pr_set_str, - clearly        */
> /*                          delineated by wang's BEGIN and END markers.[JSK?] */
> /*               Jul15 2000: pr_add reverted to a macro calling do_pr_add;   */
> /*                          also  reformatted some fprintf text . - RJL       */
> =======
> >>>>>>> 1.7
> =======
29a40
> >>>>>>> 1.7.4.3
137,145c148,164
<     fprintf(schh_fp,"/******************************************************************************/\n");
<     fprintf(schh_fp,"/* This macro will either declare or define the table variables for each      */\n");
<     fprintf(schh_fp,"/* table in the schema.  This general approach (#ifdef MAIN) is used often    */\n");
<     fprintf(schh_fp,"/* to distinguish between a main module and a non-main module.  In a main,    */\n");
<     fprintf(schh_fp,"/* a definition can occur, and variable initialization can occur.  In a non-  */\n");
<     fprintf(schh_fp,"/* main, only a declaration can occur, so the word extern is used.  Although  */\n");
<     fprintf(schh_fp,"/* VAX 'C' can handle redundant definitions, several versions of 'C' for UNIX */\n");
<     fprintf(schh_fp,"/* cannot.                                                                    */\n");
<     fprintf(schh_fp,"/******************************************************************************/\n");
---
>     fprintf(schh_fp,
> "/************************************************************************/\n");
>     fprintf(schh_fp,
> "/* This macro will either declare or define the table variables for each*/\n");
>     fprintf(schh_fp,
> "/* table in the schema. This general approach (#ifdef MAIN) is used     */\n");
>     fprintf(schh_fp,
> "/* to distinguish between main and non-main modules.  In a main,        */\n");
>     fprintf(schh_fp,
> "/* a definition or a variable initialization can occur.  In a non-main, */\n");
>     fprintf(schh_fp,
> "/* only a declaration can occur, so the word extern is used.  Although  */\n");
>     fprintf(schh_fp,
> "/* VAX 'C' can handle redundant definitions, some UNIX C versions cannot*/\n");
> 
>     fprintf(schh_fp,
>        "/****************************************************************/\n");
148,149c167,168
< /* I moved '#ifdef MAIN' below pr_add's definition  -  RJL 96/8/31 *
<  * pr_add generates 'implicit function decl and undefined' errors without it *
---
> /* I moved '#ifdef MAIN' below pr_add's definition  -  RJL 96/8/31 
>  * pr_add generates 'implicit function decl' and 'undefined' errors without it 
151d169
<  *
153a172,182
> <<<<<<< gen_defines.c
> <<<<<<< gen_defines.c
>  
>     /* 93su523 PGEN merge (BEGIN) (deleted 99s523 [for?] chgenbootstrap) */
>     /*if (cli_ansi)
>        fprintf(schh_fp, "#define pr_add(view,tbl_abbr,tbl_ptr) gen_pr_add(view, #tbl_abbr, tbl_ptr)\n");
> =======
>     if (cli_ansi)
>        fprintf(schh_fp, "#define pr_add(view,tbl_abbr,tbl_ptr)  gen_pr_add(view, #tbl_abbr,  tbl_ptr)\n");
> >>>>>>> 1.7
> =======
156a186
> >>>>>>> 1.7.4.3
162,165c192,199
<     fprintf(schh_fp, "#ifdef MAIN\n") ; /* moved here by RJL 96/8/31 */
<     fprintf(schh_fp, "#define hcg_declare(tbl) *tbl = NULL , *tbl%scurr = NULL , *tbl%stemp = NULL , *tbl%send = NULL , *tbl%selt = NULL,\\\n",sep,sep,sep,sep) ;
<     fprintf(schh_fp, "                                       *tbl%scurr2 = NULL , *tbl%stemp2 = NULL;\n",sep,sep) ;
<     fprintf(schh_fp, "#else\n") ;
---
>     fprintf(schh_fp, 
> "#ifdef MAIN\n") ; /* moved here by RJL 96/8/31 */
>     fprintf(schh_fp, 
> "#define hcg_declare(tbl) *tbl = NULL , *tbl%scurr = NULL , *tbl%stemp = NULL , *tbl%send = NULL , *tbl%selt = NULL,\\\n",sep,sep,sep,sep) ;
>     fprintf(schh_fp, 
> "        *tbl%scurr2 = NULL , *tbl%stemp2 = NULL;\n",sep,sep) ;
>     fprintf(schh_fp, 
> "#else\n") ;
167c201
<         /* define pr_add here also to fix compile time but for bde. */
---
>         /* define pr_add here also to fix compile time bug for bde. */
168a203,211
> <<<<<<< gen_defines.c
> <<<<<<< gen_defines.c
> /*   fprintf(schh_fp, 
> "#define pr_add(view,tbl_abbr,tbl_ptr) gen_pr_add(view, #tbl_abbr, tbl_ptr)\n");*/
>     fprintf(schh_fp, 
> "#define hcg_declare(tbl) *tbl, *tbl%scurr, *tbl%stemp, *tbl%send, *tbl%selt, *tbl%scurr2, *tbl%stemp2;\n",
> =======
>     fprintf(schh_fp, "#define pr_add(view,tbl_abbr,tbl_ptr)  gen_pr_add(view, #tbl_abbr,  tbl_ptr)\n");
> =======
169a213
> >>>>>>> 1.7.4.3
170a215
> >>>>>>> 1.7
172c217,218
<     fprintf(schh_fp, "#endif\n\n") ;
---
>     fprintf(schh_fp, 
> "#endif\n\n") ;
174,177c220,226
<     fprintf(schh_fp,"/******************************************************************************/\n");
<     fprintf(schh_fp,"/* This macro allows the optional insertion of the word 'extern' in various   */\n");
<     fprintf(schh_fp,"/* structures and variables.                                                  */\n");
<     fprintf(schh_fp,"/******************************************************************************/\n");
---
>     fprintf(schh_fp,
> "/************************************************************************/\n");
>     fprintf(schh_fp,
> "/* This macro allows optional insertion of the word 'extern' in various*/\n");
>     fprintf(schh_fp,
> "/* structures and variables.                                           */\n");
>     fprintf(schh_fp,"/***************************************************/\n");
184,190c233,245
<     fprintf(schh_fp,"/******************************************************************************/\n");
<     fprintf(schh_fp,"/* These macros are constants, which are copys of the same constants embedded */\n");
<     fprintf(schh_fp,"/* in CHGEN.                                                                  */\n");
<     fprintf(schh_fp,"/******************************************************************************/\n");
<     fprintf(schh_fp, "#define SCHEMA_TEXT_FILE_NAME \"%s\"\n", sch_text_file_name) ;
<     fprintf(schh_fp, "#define SCHEMA_HEADER_FILE_NAME \"%s\"\n",sch_header_file_name ) ;
<     fprintf(schh_fp, "#define SCHEMA_HEADER_FILE_NAME_LENGTH %d\n",SCHEMA_HEADER_FILE_NAME_LENGTH ) ;
---
>     fprintf(schh_fp,
> "/***********************************************************************/\n");
>     fprintf(schh_fp,
> "/* These macros are constants, ***copys of the same constants embedded */\n");
>     fprintf(schh_fp,
> "/* in CHGEN.                                                           */\n");
>     fprintf(schh_fp,"/***************************************************/\n");
>     fprintf(schh_fp, 
> "#define SCHEMA_TEXT_FILE_NAME \"%s\"\n", sch_text_file_name) ;
>     fprintf(schh_fp, 
> "#define SCHEMA_HEADER_FILE_NAME \"%s\"\n",sch_header_file_name ) ;
>     fprintf(schh_fp, 
> "#define SCHEMA_HEADER_FILE_NAME_LENGTH %d\n",SCHEMA_HEADER_FILE_NAME_LENGTH ) ;
202,205c257,264
<     fprintf(schh_fp,"/******************************************************************************/\n");
<     fprintf(schh_fp,"/* These macros are based on the schema itself.                               */\n");
<     fprintf(schh_fp,"/******************************************************************************/\n");
<     fprintf(schh_fp, "#define HCG_NUM_TABLES %d\n\n", num_tables);
---
>     fprintf(schh_fp,
> "/***********************************************************************/\n");
>     fprintf(schh_fp,
> "/* These macros are based on the schema itself.                        */\n");
>     fprintf(schh_fp,
> "/***********************************************************************/\n");
>     fprintf(schh_fp, "
> #define HCG_NUM_TABLES %d\n\n", num_tables);
214,221c273,280
< 
< 
< 
< 
<     fprintf(schh_fp, "/****************************************************/\n");
<     fprintf(schh_fp, "/*        The following decls are for key manipulation. */\n");
<     fprintf(schh_fp, "/*        The key type is defined here as well.             */\n");
<     fprintf(schh_fp, "/****************************************************/\n");
---
>     fprintf(schh_fp, 
> "/************************************************************/\n");
>     fprintf(schh_fp, 
> "/*     The following decls are for key manipulation. */\n");
>     fprintf(schh_fp, 
> "/*     The key type is defined here as well.             */\n");
>     fprintf(schh_fp, 
> "/**i*********************************************************/\n");
241c300,301
<     fprintf(schh_fp, "/********  End of key manipulation decls  ****************/\n\n");
---
>     fprintf(schh_fp, 
> "/********  End of key manipulation decls  ****************/\n\n");
243c303,305
< /*** 95s523,chwang,5,11,95. Add btree structures and other relative btree arguments.  ***/
---
> /*** 
>  95s523,chwang,5,11,95. Add btree structures and other relative btree arguments.
> ***/
246,249c308,315
<     fprintf(schh_fp,"\n\n/******************************************************************************/\n");
<     fprintf(schh_fp,"/* The following define the btree structures and relative variables for each  */\n");
<     fprintf(schh_fp,"/* table which defines btree search in schema file.                           */\n");
<     fprintf(schh_fp,"/******************************************************************************/\n\n");
---
>     fprintf(schh_fp,
> "\n\n/*******************************************************************/\n");
>     fprintf(schh_fp,
> "/* The following define the btree structures and relative variables for */\n");
>     fprintf(schh_fp,
> "/* each table which defines btree search in schema file.                */\n");
>     fprintf(schh_fp,
> "/**********************************************************************/\n\n");
258,259c324,325
<       /* made this an extern int and declared them as ints in */
<       /* gen_pr_utils.c to fix mulitiply defined problem on OSF. maldred 22-Nov-95 */
---
>       /* made this an extern int and declared them as ints in gen_pr_utils.c */
>       /* to fix multiply defined problem on OSF. maldred 22-Nov-95           */
264c330,331
<        fprintf(schh_fp,"/******************************************************************************/\n");
---
>        fprintf(schh_fp,
> "/***********************************************************************/\n");
266c333,334
<        fprintf(schh_fp,"/******************************************************************************/\n");
---
>        fprintf(schh_fp,
> "/***********************************************************************/\n");
275c343,344
<        fprintf(schh_fp,"hcg_extern struct %sbtree *%sbtroot,*%sbtelt,*%sbttemp,*%sbtcurr;  \n\n"
---
>        fprintf(schh_fp,
> "hcg_extern struct %sbtree *%sbtroot,*%sbtelt,*%sbttemp,*%sbtcurr;  \n\n"
285,292c354,371
<     fprintf(schh_fp,"/******************************************************************************/\n");
<     fprintf(schh_fp,"/* This structure holds all information about a single view.  Version list    */\n");
<     fprintf(schh_fp,"/* is really a list of numbers, but since version numbers are in the range    */\n");
<     fprintf(schh_fp,"/* 01->99, they can be stored in a single byte.  This was done to minimize    */\n");
<     fprintf(schh_fp,"/* the storage requirements of internal structures.  In the future, even if   */\n");
<     fprintf(schh_fp,"/* the 2-character version number embedded inside key fields becomes a 2-digit*/\n");
<     fprintf(schh_fp,"/* hexadecimal value, it can still be stored in a single byte.                */\n");
<     fprintf(schh_fp,"/******************************************************************************/\n");
---
>     fprintf(schh_fp,
> "/***********************************************************************/\n");
>     fprintf(schh_fp,
> "/* This structure holds information about a single view. Version list  */\n");
>     fprintf(schh_fp,
> "/* is really a list of numbers, but since version numbers are in the range*/\n");
>     fprintf(schh_fp,
> "/* 01->99, they can be stored in a single byte. This was done to minimize*/\n");
>     fprintf(schh_fp,
> "/* storage requirements of internal structures. For a 12-char key option,*/\n");
>     fprintf(schh_fp,
> "/* a 3-char version number embedded in key fields becomes a 2-hex-digit */\n");
>     fprintf(schh_fp,
> "/* value (range [0..255]), an internal key fits into one byte.          */\n");
>     fprintf(schh_fp,
> "/************************************************************************/\n");
> /* end of reformatting experiment to make text output more readable - RJL */
> 
364a444,520
> <<<<<<< gen_defines.c
> <<<<<<< gen_defines.c
> =======
> >>>>>>> 1.7.4.3
> 
> <<<<<<< gen_defines.c
>     fprintf(schh_fp,"\n/* BEGIN MODIFICATION, ctwang, 12/20/97 */\n\n");
>     fprintf(schh_fp,
> "extern char*   hcg_key   key_value; /* for pr_set_key() */\n");
>     fprintf(schh_fp,"extern int       PARSE;\n\n");
>     fprintf(schh_fp, "/* fixed 2 duplcate defs above - RJL 2k0717 */\n\n");
>     fprintf(schh_fp,"#define pr_set_int(tbl,fld,value) \\\n");
>     fprintf(schh_fp," do{\\\n");
>     fprintf(schh_fp,
> "    if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\\\n");
>     fprintf(schh_fp,
> "    {                                                          \\\n");
>     fprintf(schh_fp,
> "       fprintf( hcg_logfileptr, \"PR_SET_INT %%s %%s %%d\\n\", \\\n");
>     fprintf(schh_fp,
> "       decode_retstr( (hcg_key*)(tbl) ),#fld, ((long)value) );\\\n");
>     fprintf(schh_fp,
> "    }                                                          \\\n");
>     fprintf(schh_fp,"    (tbl)->fld = (value);                  \\\n");
>     fprintf(schh_fp,
> " }while(0)                                                     \n\n");
> =======
>     fprintf(schh_fp,"#define pr_set_int(tbl,fld,value) (tbl)->fld = (value)\n");
>     fprintf(schh_fp,"#define pr_set_flt(tbl,fld,value) (tbl)->fld = (value)\n");
>     fprintf(schh_fp,"#define pr_set_key(tbl,fld,value) (tbl)->fld = (value)\n"); /* 93su523 PGEN merge new macro */
>     fprintf(schh_fp,"\n");
> >>>>>>> 1.7
> 
> <<<<<<< gen_defines.c
>     fprintf(schh_fp,
> "#define pr_set_flt(tbl,fld,value) \\\n");
>     fprintf(schh_fp,
> " do{\\\n");
>     fprintf(schh_fp,
> "    if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\\\n");
>     fprintf(schh_fp,
> "    {\\\n");
>     fprintf(schh_fp,
> "       fprintf( hcg_logfileptr, \"PR_SET_FLT %%s %%s %%f\\n\",\\\n");
>     fprintf(schh_fp,
> "       decode_retstr( (hcg_key*)(tbl) ),\"fld\", (value) );\\\n");
>     fprintf(schh_fp,
> "    }\\\n");
>     fprintf(schh_fp,
> "    (tbl)->fld = (value); \\\n");
>     fprintf(schh_fp,
> " }while(0)\n\n");
> =======
>     if (cli_ansi) {
> >>>>>>> 1.7
> 
> <<<<<<< gen_defines.c
>     fprintf(schh_fp,
> "#define pr_set_key(tbl,fld,value) \\\n");
>     fprintf(schh_fp,
> " do{\\\n");
>     fprintf(schh_fp,
> "    if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\\\n");
>     fprintf(schh_fp,
> "    {\\\n");
>     fprintf(schh_fp,
> "       key_value = ( value ); \\\n");
>     fprintf(schh_fp,
> "       fprintf( hcg_logfileptr, \"PR_SET_KEY %%s %%s %%s\\n\",\\\n");
>     fprintf(schh_fp,
> "       decode_retstr( (hcg_key*)(tbl) ),\"fld\", decode_retstr(value) );\\\n");
>     fprintf(schh_fp,
> "    }\\\n");
>     fprintf(schh_fp,
> "    (tbl)->fld = (value); \\\n");
>     fprintf(schh_fp,
> " }while(0)\n\n");
365a522,547
>     fprintf(schh_fp,
> "#define pr_set_str(tbl,fld,value) \\\n");
>     fprintf(schh_fp,
> " do{\\\n");
>     fprintf(schh_fp,
> "    if ( strlen(value) >= sizeof((tbl)->fld) ) \\\n");
>     fprintf(schh_fp,
> "       fprintf(stderr, \\\n");
>     fprintf(schh_fp,
> "       \"Warning: field %%s in table %%s is too long- truncated\\n\",
>                          #fld, #tbl);\\\n");
>     fprintf(schh_fp,
> "    if((tbl)->RFLAG==1 && !PARSE && hcg_log ==1 )\\\n");
>     fprintf(schh_fp,
> "    {\\\n");
>     fprintf(schh_fp,
> "       fprintf( hcg_logfileptr, \"PR_SET_STR %%s %%s %%s\\n\",\\\n");
>     fprintf(schh_fp,
> "       decode_retstr( (hcg_key*)(tbl) ),#fld, (value) );\\\n");
>     fprintf(schh_fp,
> "    } \\\n");
>     fprintf(schh_fp,
> "    strncpy((tbl)->fld, (value), sizeof((tbl)->fld)-1); \\\n");
>     fprintf(schh_fp,
> " }while(0)\n\n");
> =======
411a594
> >>>>>>> 1.7.4.3
412a596
> <<<<<<< gen_defines.c
413a598,623
> =======
>         /* This do/while loop usage is REALLY ugly - MM */
>         fprintf(schh_fp,"#define pr_set_str(tbl,fld,value) \\\n");
>         fprintf(schh_fp,"  do { \\\n");
>         fprintf(schh_fp,"     if ( strlen(value) >= sizeof((tbl)->fld) ) \\\n");
>         fprintf(schh_fp,"         fprintf(stderr, \"Warning: field %%s in table %%s is too long - truncated\\n\", #fld, #tbl);\\\n");
>         fprintf(schh_fp,"     strncpy((tbl)->fld, (value), sizeof((tbl)->fld)-1); \\\n");
>         fprintf(schh_fp,"  } while(0)\n");
>         fprintf(schh_fp,"\n");
>     }
> 
>     else {
> =======
>     fprintf(schh_fp,"/* END MODIFICATION, ctwang, 12/20/97 */\n\n");
> >>>>>>> 1.7.4.3
> 
>         /* This do/while loop usage is REALLY ugly - MM */
>         fprintf(schh_fp,"#define pr_set_str(tbl,fld,value) \\\n");
>         fprintf(schh_fp,"  do { \\\n");
>         fprintf(schh_fp,"     if ( strlen(value) >= sizeof((tbl)->fld) ) \\\n");
>         fprintf(schh_fp,"         fprintf(stderr, \"Warning: field %%s in table %%s is too long - truncated\\n\", \"fld\", \"tbl\");\\\n");
>         fprintf(schh_fp,"     strncpy((tbl)->fld, (value), sizeof((tbl)->fld)-1); \\\n");
>         fprintf(schh_fp,"  } while(0)\n");
>         fprintf(schh_fp,"\n");
>     }
> >>>>>>> 1.7
514c724
<       fprintf(schh_fp, "\t\t\"%s\",0,0",tt_curr->TTabbr);
---
>       fprintf(schh_fp, "\t\t{\"%s\",0,0}",tt_curr->TTabbr);
900,901c1110,1111
<         fprintf(schh_fp,"\
< \n\
---
>         fprintf(schh_fp,
> "\n\
922a1133,1140
> <<<<<<< gen_defines.c
> <<<<<<< gen_defines.c
>     extern void do_pr_add(char *, char *, hcg_ptr);\n\
>     /* #define pr_add(a,b,c) do_pr_add(a,#b,c) in pr_load.c */\n\
> =======
>     extern void gen_pr_add(char *, char *, hcg_ptr);\n\
> >>>>>>> 1.7
> =======
923a1142
> >>>>>>> 1.7.4.3
-------------------------------------------

There are mo merge conflicts in $CASE/99s523/genmerge/chgenv11/chgen/src files:

mercury.cs.uml.edu(141)> pwd
/nfs/earth/misc/proj3/case/99s523/genmerge/chgenv11/chgen/src
mercury.cs.uml.edu(142)> grep ====== *.c
mercury.cs.uml.edu(143)>

mercury.cs.uml.edu(103)> lg $CASE/99s523/genmerge/chgen
lrwxrwxrwx    1 lechner  fac             8 May  5 19:56 /usr/proj3/case/99s523/genmerge/chgen -> chgenv11
mercury.cs.uml.edu(104)> grep ====== $CASE/99s523/genmerge/chgen/chgen/src/*.c
<No conflicts>
--------------------------------------------

mercury.cs.uml.edu(106)> grep ====== chgen/src/*.c|wc
     18      18     644
(18 occurrences, in gen_defines.c and gen_pr_load.c):
-------------------------
mercury.cs.uml.edu(105)> grep ====== chgen/src/*.c
chgen/src/gen_defines.c:34:=======
chgen/src/gen_defines.c:36:=======
chgen/src/gen_defines.c:178:=======
chgen/src/gen_defines.c:182:=======
chgen/src/gen_defines.c:209:=======
chgen/src/gen_defines.c:211:=======
chgen/src/gen_defines.c:446:=======
chgen/src/gen_defines.c:470:=======
chgen/src/gen_defines.c:496:=======
chgen/src/gen_defines.c:547:=======
chgen/src/gen_defines.c:598:=======
chgen/src/gen_defines.c:610:=======
chgen/src/gen_defines.c:1137:=======
chgen/src/gen_defines.c:1140:=======
chgen/src/gen_pr_load.c:45:=======
chgen/src/gen_pr_load.c:47:=======
chgen/src/gen_pr_load.c:58:=======
chgen/src/gen_pr_load.c:61:=======
mercury.cs.uml.edu(107)>