diff -rc2P rcs5.6/README rcs5.6.0.1/README *** rcs5.6/README Fri Nov 22 07:25:04 1991 --- rcs5.6.0.1/README Wed Mar 24 20:27:12 1993 *************** *** 1,3 **** ! This directory contains complete sources for RCS version 5.6. RCS, the Revision Control System, manages multiple revisions of files. --- 1,3 ---- ! This directory contains complete sources for RCS version 5.6.0.1. RCS, the Revision Control System, manages multiple revisions of files. *************** *** 32,36 **** */ ! $Id: README,v 5.16 1991/11/03 01:09:19 eggert Exp $ --- 32,36 ---- */ ! $Id: README,v 5.16.0.1 1993/03/25 04:27:12 eggert Exp $ *************** *** 74,77 **** --- 74,82 ---- + Features new to RCS version 5.6.0.1 include: + + A new DIFF3_A configuration flag for GNU diff3 2.1 and later; + see src/README. + Features new to RCS version 5.6 include: diff -rc2P rcs5.6/src/Makefile rcs5.6.0.1/src/Makefile *** rcs5.6/src/Makefile Fri Nov 22 07:24:25 1991 --- rcs5.6.0.1/src/Makefile Wed Mar 24 20:36:22 1993 *************** *** 1,3 **** ! # $Id: Makefile,v 5.16 1991/10/07 17:32:46 eggert Exp $ # Copyright (C) 1982, 1988, 1989 Walter Tichy # Copyright 1990, 1991 by Paul Eggert --- 1,3 ---- ! # $Id: Makefile,v 5.16.0.1 1993/03/25 04:36:22 eggert Exp $ # Copyright (C) 1982, 1988, 1989 Walter Tichy # Copyright 1990, 1991 by Paul Eggert *************** *** 79,82 **** --- 79,85 ---- #DIFF3 = /usr/lib/rdiff3 + DIFF3_A = 1# GNU diff 2.1 or later + #DIFF3_A = 0# all other diffs + DIFF3_BIN = 1# GNU diff #DIFF3_BIN = 0# traditional diff *************** *** 166,170 **** CC='$(CC)' CFLAGS='$(CFLAGS)' \ COMPAT2='$(COMPAT2)' \ ! DIFF3='$(DIFF3)' DIFF3_BIN='$(DIFF3_BIN)' \ DIFF='$(DIFF)' DIFF_FLAGS='$(DIFF_FLAGS)' DIFF_L='$(DIFF_L)' \ DIFF_SUCCESS='$(DIFF_SUCCESS)' DIFF_FAILURE='$(DIFF_FAILURE)' DIFF_TROUBLE='$(DIFF_TROUBLE)' \ --- 169,173 ---- CC='$(CC)' CFLAGS='$(CFLAGS)' \ COMPAT2='$(COMPAT2)' \ ! DIFF3='$(DIFF3)' DIFF3_A='$(DIFF3_A)' DIFF3_BIN='$(DIFF3_BIN)' \ DIFF='$(DIFF)' DIFF_FLAGS='$(DIFF_FLAGS)' DIFF_L='$(DIFF_L)' \ DIFF_SUCCESS='$(DIFF_SUCCESS)' DIFF_FAILURE='$(DIFF_FAILURE)' DIFF_TROUBLE='$(DIFF_TROUBLE)' \ diff -rc2P rcs5.6/src/README rcs5.6.0.1/src/README *** rcs5.6/src/README Fri Nov 22 07:24:51 1991 --- rcs5.6.0.1/src/README Wed Mar 24 20:24:14 1993 *************** *** 1,5 **** RCS configuration instructions ! $Id: README,v 1.5 1991/10/07 17:32:46 eggert Exp $ Copyright 1991 by Paul Eggert --- 1,5 ---- RCS configuration instructions ! $Id: README,v 1.5.0.1 1993/03/25 04:24:14 eggert Exp $ Copyright 1991 by Paul Eggert *************** *** 111,114 **** --- 111,118 ---- whose name is /usr/lib/diff3 or /usr/5lib/rdiff3prog or something similar. + DIFF3_A is 1 if your diff3 has an -A option, 0 otherwise. + This option is available in GNU diff 2.1 and later; it generates better + quality diff3 output, but RCS is not yet ready for it. + DIFF3_BIN is 1 if DIFF3 is the user-visible GNU diff3 program (see DIFF3). Before setting this to 1, make sure your diff3 understands -a, -L, and and -m; diff -rc2P rcs5.6/src/conf.heg rcs5.6.0.1/src/conf.heg *** rcs5.6/src/conf.heg Fri Nov 22 07:24:50 1991 --- rcs5.6.0.1/src/conf.heg Wed Mar 24 20:22:46 1993 *************** *** 1,5 **** /* example RCS compile-time configuration */ ! /* $Id: conf.heg,v 1.8 1991/11/20 18:21:09 eggert Exp $ */ /* --- 1,5 ---- /* example RCS compile-time configuration */ ! /* $Id: conf.heg,v 1.8.0.1 1993/03/25 04:22:46 eggert Exp $ */ /* *************** *** 196,199 **** --- 196,200 ---- #define DIFF "/usr/local/bin/diff" /* name of 'diff' program */ #define DIFF3 "/usr/local/bin/diff3" /* name of 'diff3' program */ + #define DIFF3_A 1 /* Does diff3 have an -A option? */ #define DIFF3_BIN 1 /* Is diff3 user-visible (not the /usr/lib auxiliary)? */ #define DIFF_FLAGS , "-an" /* Make diff output suitable for RCS. */ diff -rc2P rcs5.6/src/conf.sh rcs5.6.0.1/src/conf.sh *** rcs5.6/src/conf.sh Fri Nov 22 07:24:28 1991 --- rcs5.6.0.1/src/conf.sh Wed Mar 24 20:24:49 1993 *************** *** 1,5 **** #!/bin/sh # Output RCS compile-time configuration. ! Id='$Id: conf.sh,v 5.14 1991/11/20 18:21:10 eggert Exp $' # Copyright 1990, 1991 by Paul Eggert # Distributed under license by the Free Software Foundation, Inc. --- 1,5 ---- #!/bin/sh # Output RCS compile-time configuration. ! Id='$Id: conf.sh,v 5.14.0.1 1993/03/25 04:24:49 eggert Exp $' # Copyright 1990, 1991 by Paul Eggert # Distributed under license by the Free Software Foundation, Inc. *************** *** 36,39 **** --- 36,40 ---- : ${COMPAT2=0} : ${DIFF3=${RCSPREFIX}diff3} + : ${DIFF3_A=1} : ${DIFF3_BIN=1} : ${DIFF=${RCSPREFIX}diff} *************** *** 1252,1255 **** --- 1253,1258 ---- echo "#define DIFF3 \"${DIFF3}\" /* name of 'diff3' program */" + echo "#define DIFF3_A $DIFF3_A /* Does diff3 have an -A option? */" + echo "#define DIFF3_BIN $DIFF3_BIN /* Is diff3 user-visible (not the /usr/lib auxiliary)? */" diff -rc2P rcs5.6/src/merger.c rcs5.6.0.1/src/merger.c *** rcs5.6/src/merger.c Fri Nov 22 07:24:51 1991 --- rcs5.6.0.1/src/merger.c Wed Mar 24 20:25:07 1993 *************** *** 28,32 **** #include "rcsbase.h" ! libId(mergerId, "$Id: merger.c,v 1.3 1991/08/20 23:05:00 eggert Exp $") static char const * --- 28,32 ---- #include "rcsbase.h" ! libId(mergerId, "$Id: merger.c,v 1.3.0.1 1993/03/25 04:25:07 eggert Exp $") static char const * *************** *** 82,86 **** s = run( (char*)0, t, ! DIFF3, "-am", "-L", label[0], "-L", label[1], a[0], a[1], a[2], (char*)0 ); --- 82,92 ---- s = run( (char*)0, t, ! # if DIFF3_A ! /* GNU diff 2.1 or later. We turn off -A for now. */ ! DIFF3, "-amE", "-L", label[0], "-L", "", "-L", label[1], ! # else ! /* GNU diff 2.0 or earlier */ ! DIFF3, "-am", "-L", label[0], "-L", label[1], ! # endif a[0], a[1], a[2], (char*)0 );