This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Force merge conflicts in fixincl.x
- From: Bruce Korb <bkorb at veritas dot com>
- To: GCC-Patches <gcc-patches at gcc dot gnu dot org>
- Date: Sat, 19 Apr 2003 10:57:23 -0700
- Subject: Force merge conflicts in fixincl.x
- Organization: Home
The attached patch is designed to cause merge conflicts.
This patch should only affect people who have modified
one of the fixincl.x source files (fixincl.tpl or inclhack.def).
If you've been changing those files, then you should be able
to regenerate fixincl.x. As we have seen, it is unwise
to presume that a merge is successful just because there are
not conflicts that CVS can detect. The counters can wind
up wrong. The proper (reliable) way to perform a version
update merge is to do the merge so CVS believes it has the
right version of fixincl.x and then regenerate anyway. So,
this patch adds a "DO NOT CVS-MERGE" comment in some code
that is certain to conflict.
Objections, anyone? :-)
Index: fixincl.tpl
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/fixincl.tpl,v
retrieving revision 1.21
diff -u -p -r1.21 fixincl.tpl
--- fixincl.tpl 27 May 2001 18:21:02 -0000 1.21
+++ fixincl.tpl 19 Apr 2003 17:38:36 -0000
@@ -1,11 +1,15 @@
[= AutoGen5 Template -*- Mode: C -*-
x=fixincl.x =]
-/*
- * DO NOT EDIT THIS FILE - it has been generated
+[= (dne " * " "/* ")=]
+ */
+/* DO NOT CVS-MERGE THIS FILE, EITHER [=`date`=]
*
- * Install modified versions of certain ANSI-incompatible system header
- * files which are fixed to work correctly with ANSI C and placed in a
- * directory that GNU C will search.
+ * You must regenerate it. Use the ./genfixes script.
+ *
+ *
+ * This is part of the fixincl program used to install modified versions of
+ * certain ANSI-incompatible system header files which are fixed to work
+ * correctly with ANSI C and placed in a directory that GNU C will search.
*
* This file contains [=(count "fix")=] fixup descriptions.
*
Index: fixincl.x
===================================================================
RCS file: /cvs/gcc/gcc/gcc/fixinc/fixincl.x,v
retrieving revision 1.147
diff -u -p -r1.147 fixincl.x
--- fixincl.x 5 Apr 2003 23:12:47 -0000 1.147
+++ fixincl.x 19 Apr 2003 17:38:38 -0000
@@ -1,9 +1,19 @@
-/*
- * DO NOT EDIT THIS FILE - it has been generated
- *
- * Install modified versions of certain ANSI-incompatible system header
- * files which are fixed to work correctly with ANSI C and placed in a
- * directory that GNU C will search.
+/* -*- buffer-read-only: t -*- vi: set ro:
+ *
+ * DO NOT EDIT THIS FILE (fixincl.x)
+ *
+ * It has been AutoGen-ed Saturday April 19, 2003 at 10:45:24 AM PDT
+ * From the definitions inclhack.def
+ * and the template file fixincl
+ */
+/* DO NOT CVS-MERGE THIS FILE, EITHER Sat Apr 19 10:45:24 PDT 2003
+ *
+ * You must regenerate it. Use the ./genfixes script.
+ *
+ *
+ * This is part of the fixincl program used to install modified versions of
+ * certain ANSI-incompatible system header files which are fixed to work
+ * correctly with ANSI C and placed in a directory that GNU C will search.
*
* This file contains 149 fixup descriptions.
*