Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 4 Jan 2010 00:32:22 +0000 (UTC)
From:      "David E. O'Brien" <obrien@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r201455 - head/usr.bin/make
Message-ID:  <201001040032.o040WM4j096362@svn.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: obrien
Date: Mon Jan  4 00:32:22 2010
New Revision: 201455
URL: http://svn.freebsd.org/changeset/base/201455

Log:
  Add check for subversion "original" marker.

Modified:
  head/usr.bin/make/parse.c

Modified: head/usr.bin/make/parse.c
==============================================================================
--- head/usr.bin/make/parse.c	Mon Jan  4 00:11:46 2010	(r201454)
+++ head/usr.bin/make/parse.c	Mon Jan  4 00:32:22 2010	(r201455)
@@ -802,6 +802,7 @@ ParseDoDependency(char *line)
 			 * merges.
 			 */
 			if (strncmp(line, "<<<<<<", 6) == 0 ||
+			    strncmp(line, "||||||", 6) == 0 ||
 			    strncmp(line, "======", 6) == 0 ||
 			    strncmp(line, ">>>>>>", 6) == 0) {
 				Parse_Error(PARSE_FATAL, "Makefile appears to "



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201001040032.o040WM4j096362>