Module Name: src
Committed By: rillig
Date: Sat Aug 19 11:09:02 UTC 2023
Modified Files:
src/usr.bin/make: parse.c
src/usr.bin/make/unit-tests: directive-export-gmake.exp
directive-export-gmake.mk directive.exp directive.mk parse.exp
parse.mk varname.exp varname.mk
Log Message:
make: show realistic invalid line in error message
Previously, the error message 'Invalid line' showed only the expanded
line, which might or might not show the actual problem. To be more
helpful, add the unexpanded line to the error message in case they
differ.
Remove the special handling of invalid lines that result from merge
conflicts. RCS is not commonly used anymore, and mentioning CVS was too
specific. By echoing the whole line, the patterns '<<<<<<' and '>>>>>>'
are clear enough to hint at the problem.
To generate a diff of this commit:
cvs rdiff -u -r1.705 -r1.706 src/usr.bin/make/parse.c
cvs rdiff -u -r1.3 -r1.4 \
src/usr.bin/make/unit-tests/directive-export-gmake.exp
cvs rdiff -u -r1.5 -r1.6 \
src/usr.bin/make/unit-tests/directive-export-gmake.mk \
src/usr.bin/make/unit-tests/parse.exp
cvs rdiff -u -r1.8 -r1.9 src/usr.bin/make/unit-tests/directive.exp
cvs rdiff -u -r1.7 -r1.8 src/usr.bin/make/unit-tests/directive.mk
cvs rdiff -u -r1.6 -r1.7 src/usr.bin/make/unit-tests/parse.mk
cvs rdiff -u -r1.19 -r1.20 src/usr.bin/make/unit-tests/varname.exp
cvs rdiff -u -r1.12 -r1.13 src/usr.bin/make/unit-tests/varname.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
