jimzah/freebsd-src
1
0
Fork 0
mirror of https://github.com/freebsd/freebsd-src.git synced 2024-11-29 02:22:43 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Provide a heuristic for RCS conflicts.

Browse Source 
Obtained from:	NetBSD
This commit is contained in:
Juli Mallett 2002-06-20 19:44:34 +00:00
parent f7c5a79be8
commit 536dddacf1
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=98506
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
usr.bin/make/parse.c
View File

@ -772,9 +772,16 @@ ParseDoDependency (line)
if (!*cp) {
/*
* Ending a dependency line without an operator is a Bozo
* no-no
* no-no. As a heuristic, this is also often triggered by
* undetected conflicts from cvs/rcs merges.
*/
Parse_Error (PARSE_FATAL, "Need an operator");
if ((strncmp(line, "<<<<<<", 6) == 0) ||
(strncmp(line, "======", 6) == 0) ||
(strncmp(line, ">>>>>>", 6) == 0))
Parse_Error (PARSE_FATAL,
"Makefile appears to contain unresolved cvs/rcs/??? merge conflicts");
else
Parse_Error (PARSE_FATAL, "Need an operator");
return;
}
*cp = '\0';