This is the mail archive of the gcc@gcc.gnu.org mailing list for the GCC project.

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]

Re: [C++] Compile-Time Reflection Branch

From: Diego Novillo <dnovillo at redhat dot com>
To: Phil Edwards <phil at jaj dot com>
Cc: Gabriel Dos_Reis <gdosreis at sophia dot inria dot fr>, gcc at gcc dot gnu dot org
Date: Tue, 28 Jan 2003 10:51:32 -0500
Subject: Re: [C++] Compile-Time Reflection Branch
Organization: Red Hat Canada
References: <15926.24530.387987.95771@perceval.inria.fr> <20030128132928.GA24054@disaster.jaj.com>

On Tue, 28 Jan 2003, Phil Edwards wrote:

> Are there guidelines somewhere for how to handle checkins and merges
> with regard to changelog entries?  For example, the tree-ssa
> branch has "ChangeLog.tree-saa" files in whatever directory
> they change. I don't know what they use for a log entry in the
> main changelog whenever merges take place, though.
> 
The main ChangeLog files get silently merged.  I add no merge
markers.  The checking message contains the phrase "Merged with
xxxx as of YYYY-MM-DD." and all the files are tagged.


Diego.

References:
- [C++] Compile-Time Reflection Branch
  - From: Gabriel Dos_Reis
- Re: [C++] Compile-Time Reflection Branch
  - From: Phil Edwards

Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]