diff options
Diffstat (limited to 'gnu/usr.bin/rcs/rcsmerge')
| -rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/Makefile | 8 | ||||
| -rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 | 189 | ||||
| -rw-r--r-- | gnu/usr.bin/rcs/rcsmerge/rcsmerge.c | 286 |
3 files changed, 0 insertions, 483 deletions
diff --git a/gnu/usr.bin/rcs/rcsmerge/Makefile b/gnu/usr.bin/rcs/rcsmerge/Makefile deleted file mode 100644 index 9fd8afa..0000000 --- a/gnu/usr.bin/rcs/rcsmerge/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -PROG= rcsmerge -SRCS= rcsmerge.c -CFLAGS+= -I${.CURDIR}/../lib -LDADD= ${LIBRCS} -DPADD= ${LIBRCS} - -.include "../../Makefile.inc" -.include <bsd.prog.mk> diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 deleted file mode 100644 index aff6f66..0000000 --- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.1 +++ /dev/null @@ -1,189 +0,0 @@ -.de Id -.ds Rv \\$3 -.ds Dt \\$4 -.. -.Id $FreeBSD$ -.ds r \&\s-1RCS\s0 -.if n .ds - \%-- -.if t .ds - \(em -.TH RCSMERGE 1 \*(Dt GNU -.SH NAME -rcsmerge \- merge RCS revisions -.SH SYNOPSIS -.B rcsmerge -.RI [ options ] " file" -.SH DESCRIPTION -.B rcsmerge -incorporates the changes between two revisions -of an \*r file into the corresponding working file. -.PP -Pathnames matching an \*r suffix denote \*r files; -all others denote working files. -Names are paired as explained in -.BR ci (1). -.PP -At least one revision must be specified with one of the options -described below, usually -.BR \-r . -At most two revisions may be specified. -If only one revision is specified, the latest -revision on the default branch (normally the highest branch on the trunk) -is assumed for the second revision. -Revisions may be specified numerically or symbolically. -.PP -.B rcsmerge -prints a warning if there are overlaps, and delimits -the overlapping regions as explained in -.BR merge (1). -The command is useful for incorporating changes into a checked-out revision. -.SH OPTIONS -.TP -.B \-A -Output conflicts using the -.B \-A -style of -.BR diff3 (1), -if supported by -.BR diff3 . -This merges all changes leading from -.I file2 -to -.I file3 -into -.IR file1 , -and generates the most verbose output. -.TP -\f3\-E\fP, \f3\-e\fP -These options specify conflict styles that generate less information -than -.BR \-A . -See -.BR diff3 (1) -for details. -The default is -.BR \-E . -With -.BR \-e , -.B rcsmerge -does not warn about conflicts. -.TP -.BI \-k subst -Use -.I subst -style keyword substitution. -See -.BR co (1) -for details. -For example, -.B "\-kk\ \-r1.1\ \-r1.2" -ignores differences in keyword values when merging the changes from -.B 1.1 -to -.BR 1.2 . -It normally does not make sense to merge binary files as if they were text, so -.B rcsmerge -refuses to merge files if -.B \-kb -expansion is used. -.TP -.BR \-p [\f2rev\fP] -Send the result to standard output instead of overwriting the working file. -.TP -.BR \-q [\f2rev\fP] -Run quietly; do not print diagnostics. -.TP -.BR \-r [\f2rev\fP] -Merge with respect to revision -.IR rev . -Here an empty -.I rev -stands for the latest revision on the default branch, normally the head. -.TP -.B \-T -This option has no effect; -it is present for compatibility with other \*r commands. -.TP -.BI \-V -Print \*r's version number. -.TP -.BI \-V n -Emulate \*r version -.IR n . -See -.BR co (1) -for details. -.TP -.BI \-x "suffixes" -Use -.I suffixes -to characterize \*r files. -See -.BR ci (1) -for details. -.TP -.BI \-z zone -Use -.I zone -as the time zone for keyword substitution. -See -.BR co (1) -for details. -.SH EXAMPLES -Suppose you have released revision 2.8 of -.BR f.c . -Assume -furthermore that after you complete an unreleased revision 3.4, you receive -updates to release 2.8 from someone else. -To combine the updates to 2.8 and your changes between 2.8 and 3.4, -put the updates to 2.8 into file f.c and execute -.LP -.B " rcsmerge \-p \-r2.8 \-r3.4 f.c >f.merged.c" -.PP -Then examine -.BR f.merged.c . -Alternatively, if you want to save the updates to 2.8 in the \*r file, -check them in as revision 2.8.1.1 and execute -.BR "co \-j": -.LP -.B " ci \-r2.8.1.1 f.c" -.br -.B " co \-r3.4 \-j2.8:2.8.1.1 f.c" -.PP -As another example, the following command undoes the changes -between revision 2.4 and 2.8 in your currently checked out revision -in -.BR f.c . -.LP -.B " rcsmerge \-r2.8 \-r2.4 f.c" -.PP -Note the order of the arguments, and that -.B f.c -will be -overwritten. -.SH ENVIRONMENT -.TP -.B \s-1RCSINIT\s0 -options prepended to the argument list, separated by spaces. -See -.BR ci (1) -for details. -.SH DIAGNOSTICS -Exit status is 0 for no overlaps, 1 for some overlaps, 2 for trouble. -.SH IDENTIFICATION -Author: Walter F. Tichy. -.br -Manual Page Revision: \*(Rv; Release Date: \*(Dt. -.br -Copyright \(co 1982, 1988, 1989 Walter F. Tichy. -.br -Copyright \(co 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert. -.SH "SEE ALSO" -ci(1), co(1), ident(1), merge(1), rcs(1), rcsdiff(1), rcsintro(1), rlog(1), -rcsfile(5) -.br -Walter F. Tichy, -\*r\*-A System for Version Control, -.I "Software\*-Practice & Experience" -.BR 15 , -7 (July 1985), 637-654. -.br diff --git a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c b/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c deleted file mode 100644 index e09dc24..0000000 --- a/gnu/usr.bin/rcs/rcsmerge/rcsmerge.c +++ /dev/null @@ -1,286 +0,0 @@ -/* Merge RCS revisions. */ - -/* Copyright 1982, 1988, 1989 Walter Tichy - Copyright 1990, 1991, 1992, 1993, 1994, 1995 Paul Eggert - Distributed under license by the Free Software Foundation, Inc. - -This file is part of RCS. - -RCS is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -RCS is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with RCS; see the file COPYING. -If not, write to the Free Software Foundation, -59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -Report problems and direct all questions to: - - rcs-bugs@cs.purdue.edu - -*/ - -/* - * Revision 5.15 1995/06/16 06:19:24 eggert - * Update FSF address. - * - * Revision 5.14 1995/06/01 16:23:43 eggert - * (main): Report an error if -kb, so don't worry about binary stdout. - * Punctuate messages properly. Rewrite to avoid `goto end'. - * - * Revision 5.13 1994/03/17 14:05:48 eggert - * Specify subprocess input via file descriptor, not file name. Remove lint. - * - * Revision 5.12 1993/11/09 17:40:15 eggert - * -V now prints version on stdout and exits. Don't print usage twice. - * - * Revision 5.11 1993/11/03 17:42:27 eggert - * Add -A, -E, -e, -z. Ignore -T. Allow up to three file labels. - * Pass -Vn to `co'. Pass unexpanded revision name to `co', so that Name works. - * - * Revision 5.10 1992/07/28 16:12:44 eggert - * Add -V. - * - * Revision 5.9 1992/01/24 18:44:19 eggert - * lint -> RCS_lint - * - * Revision 5.8 1992/01/06 02:42:34 eggert - * Update usage string. - * - * Revision 5.7 1991/11/20 17:58:09 eggert - * Don't Iopen(f, "r+"); it's not portable. - * - * Revision 5.6 1991/08/19 03:13:55 eggert - * Add -r$. Tune. - * - * Revision 5.5 1991/04/21 11:58:27 eggert - * Add -x, RCSINIT, MS-DOS support. - * - * Revision 5.4 1991/02/25 07:12:43 eggert - * Merging a revision to itself is no longer an error. - * - * Revision 5.3 1990/11/01 05:03:50 eggert - * Remove unneeded setid check. - * - * Revision 5.2 1990/09/04 08:02:28 eggert - * Check for I/O error when reading working file. - * - * Revision 5.1 1990/08/29 07:14:04 eggert - * Add -q. Pass -L options to merge. - * - * Revision 5.0 1990/08/22 08:13:41 eggert - * Propagate merge's exit status. - * Remove compile-time limits; use malloc instead. - * Make lock and temp files faster and safer. Ansify and Posixate. Add -V. - * Don't use access(). Tune. - * - * Revision 4.5 89/05/01 15:13:16 narten - * changed copyright header to reflect current distribution rules - * - * Revision 4.4 88/08/09 19:13:13 eggert - * Beware merging into a readonly file. - * Beware merging a revision to itself (no change). - * Use execv(), not system(); yield exit status like diff(1)'s. - * - * Revision 4.3 87/10/18 10:38:02 narten - * Updating version numbers. Changes relative to version 1.1 - * actually relative to 4.1 - * - * Revision 1.3 87/09/24 14:00:31 narten - * Sources now pass through lint (if you ignore printf/sprintf/fprintf - * warnings) - * - * Revision 1.2 87/03/27 14:22:36 jenkins - * Port to suns - * - * Revision 4.1 83/03/28 11:14:57 wft - * Added handling of default branch. - * - * Revision 3.3 82/12/24 15:29:00 wft - * Added call to catchsig(). - * - * Revision 3.2 82/12/10 21:32:02 wft - * Replaced getdelta() with gettree(); improved error messages. - * - * Revision 3.1 82/11/28 19:27:44 wft - * Initial revision. - * - */ -#include "rcsbase.h" - -static char const co[] = CO; - -mainProg(rcsmergeId, "rcsmerge", "$FreeBSD$") -{ - static char const cmdusage[] = - "\nrcsmerge usage: rcsmerge -rrev1 [-rrev2] -ksubst -{pq}[rev] -Vn -xsuff -zzone file"; - static char const quietarg[] = "-q"; - - register int i; - char *a, **newargv; - char const *arg[3]; - char const *rev[3], *xrev[3]; /*revision numbers*/ - char const *edarg, *expandarg, *suffixarg, *versionarg, *zonearg; - int tostdout; - int status; - RILE *workptr; - struct buf commarg; - struct buf numericrev; /* holds expanded revision number */ - struct hshentries *gendeltas; /* deltas to be generated */ - struct hshentry * target; - - bufautobegin(&commarg); - bufautobegin(&numericrev); - edarg = rev[1] = rev[2] = 0; - status = 0; /* Keep lint happy. */ - tostdout = false; - expandarg = suffixarg = versionarg = zonearg = quietarg; /* no-op */ - suffixes = X_DEFAULT; - - argc = getRCSINIT(argc, argv, &newargv); - argv = newargv; - while (a = *++argv, 0<--argc && *a++=='-') { - switch (*a++) { - case 'p': - tostdout=true; - goto revno; - - case 'q': - quietflag = true; - revno: - if (!*a) - break; - /* falls into -r */ - case 'r': - if (!rev[1]) - rev[1] = a; - else if (!rev[2]) - rev[2] = a; - else - error("too many revision numbers"); - break; - - case 'A': case 'E': case 'e': - if (*a) - goto unknown; - edarg = *argv; - break; - - case 'x': - suffixarg = *argv; - suffixes = a; - break; - case 'z': - zonearg = *argv; - zone_set(a); - break; - case 'T': - /* Ignore -T, so that RCSINIT can contain -T. */ - if (*a) - goto unknown; - break; - case 'V': - versionarg = *argv; - setRCSversion(versionarg); - break; - - case 'k': - expandarg = *argv; - if (0 <= str2expmode(expandarg+2)) - break; - /* fall into */ - default: - unknown: - error("unknown option: %s%s", *argv, cmdusage); - }; - } /* end of option processing */ - - if (!rev[1]) faterror("no base revision number given"); - - /* Now handle all pathnames. */ - - if (!nerror) { - if (argc < 1) - faterror("no input file%s", cmdusage); - if (0 < pairnames(argc, argv, rcsreadopen, true, false)) { - - if (argc>2 || (argc==2 && argv[1])) - warn("excess arguments ignored"); - if (Expand == BINARY_EXPAND) - workerror("merging binary files"); - diagnose("RCS file: %s\n", RCSname); - if (!(workptr = Iopen(workname, FOPEN_R_WORK, (struct stat*)0))) - efaterror(workname); - - gettree(); /* reads in the delta tree */ - - if (!Head) rcsfaterror("no revisions present"); - - if (!*rev[1]) - rev[1] = Dbranch ? Dbranch : Head->num; - if (fexpandsym(rev[1], &numericrev, workptr) - && (target=genrevs(numericrev.string, (char *)0, (char *)0, (char*)0, &gendeltas)) - ) { - xrev[1] = target->num; - if (!rev[2] || !*rev[2]) - rev[2] = Dbranch ? Dbranch : Head->num; - if (fexpandsym(rev[2], &numericrev, workptr) - && (target=genrevs(numericrev.string, (char *)0, (char *)0, (char *)0, &gendeltas)) - ) { - xrev[2] = target->num; - - if (strcmp(xrev[1],xrev[2]) == 0) { - if (tostdout) { - fastcopy(workptr, stdout); - Ofclose(stdout); - } - } else { - Izclose(&workptr); - - for (i=1; i<=2; i++) { - diagnose("retrieving revision %s\n", xrev[i]); - bufscpy(&commarg, "-p"); - bufscat(&commarg, rev[i]); /* not xrev[i], for $Name's sake */ - if (run( - -1, - /* Do not collide with merger.c maketemp(). */ - arg[i] = maketemp(i+2), - co, quietarg, commarg.string, - expandarg, suffixarg, versionarg, zonearg, - RCSname, (char*)0 - )) - rcsfaterror("co failed"); - } - diagnose("Merging differences between %s and %s into %s%s\n", - xrev[1], xrev[2], workname, - tostdout?"; result to stdout":""); - - arg[0] = xrev[0] = workname; - status = merge(tostdout, edarg, xrev, arg); - } - } - } - - Izclose(&workptr); - } - } - tempunlink(); - exitmain(nerror ? DIFF_TROUBLE : status); -} - -#if RCS_lint -# define exiterr rmergeExit -#endif - void -exiterr() -{ - tempunlink(); - _exit(DIFF_TROUBLE); -} |
