d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Back out my -L change, now "patch -I" usage supposed to get Index:

Browse Source 
precedence
This commit is contained in:
Andrey A. Chernov 1998-01-21 15:20:29 +00:00
parent 0b00e7b2c0
commit e562327407
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/cvs/src/diff.c
View File

@ -568,9 +568,7 @@ diff_fileproc (callerdat, finfo)
if (empty_file == DIFF_ADDED)
{
if (use_rev2 == NULL)
run_setup ("%s %s -L%s -L%s %s %s", DIFF, opts,
DEVNULL, finfo->fullname,
DEVNULL, finfo->file);
run_setup ("%s %s %s %s", DIFF, opts, DEVNULL, finfo->file);
else
{
int retcode;
@ -591,9 +589,7 @@ diff_fileproc (callerdat, finfo)
}
/* FIXME: what if retcode > 0? */
run_setup ("%s %s -L%s -L%s %s %s", DIFF, opts,
DEVNULL, finfo->fullname,
DEVNULL, tmp);
run_setup ("%s %s %s %s", DIFF, opts, DEVNULL, tmp);
}
}
else
@ -614,23 +610,21 @@ diff_fileproc (callerdat, finfo)
}
/* FIXME: what if retcode > 0? */
run_setup ("%s %s -L%s %s %s", DIFF, opts,
finfo->fullname, tmp, DEVNULL);
run_setup ("%s %s %s %s", DIFF, opts, tmp, DEVNULL);
}
}
else
{
if (use_rev2)
{
run_setup ("%s%s -x,v/ %s %s -r%s -r%s -L%s", Rcsbin, RCS_DIFF,
run_setup ("%s%s -x,v/ %s %s -r%s -r%s", Rcsbin, RCS_DIFF,
opts, *options ? options : vers->options,
use_rev1, use_rev2, finfo->fullname);
use_rev1, use_rev2);
}
else
{
run_setup ("%s%s -x,v/ %s %s -r%s -L%s", Rcsbin, RCS_DIFF, opts,
*options ? options : vers->options, use_rev1,
finfo->fullname);
run_setup ("%s%s -x,v/ %s %s -r%s", Rcsbin, RCS_DIFF, opts,
*options ? options : vers->options, use_rev1);
}
run_arg (vers->srcfile->path);
}