diff options
| author | jmallett <jmallett@FreeBSD.org> | 2002-06-20 19:44:34 +0000 |
|---|---|---|
| committer | jmallett <jmallett@FreeBSD.org> | 2002-06-20 19:44:34 +0000 |
| commit | 6fa0c764dc2e8bee49bb5de62d57acc15318d935 (patch) | |
| tree | 4ccf76922b642072206e5586eb747e8542dd3042 /usr.bin | |
| parent | c23eb42da9d9292d71d37ed62262551cbf3e2903 (diff) | |
| download | FreeBSD-src-6fa0c764dc2e8bee49bb5de62d57acc15318d935.zip FreeBSD-src-6fa0c764dc2e8bee49bb5de62d57acc15318d935.tar.gz | |
Provide a heuristic for RCS conflicts.
Obtained from: NetBSD
Diffstat (limited to 'usr.bin')
| -rw-r--r-- | usr.bin/make/parse.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/usr.bin/make/parse.c b/usr.bin/make/parse.c index c82bf3b..1828bc6 100644 --- a/usr.bin/make/parse.c +++ b/usr.bin/make/parse.c @@ -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'; |
