From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1164 invoked by alias); 28 Jan 2003 15:52:51 -0000 Mailing-List: contact gcc-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Archive: List-Post: List-Help: Sender: gcc-owner@gcc.gnu.org Received: (qmail 1157 invoked from network); 28 Jan 2003 15:52:51 -0000 Received: from unknown (HELO monty-python.gnu.org) (199.232.76.173) by 172.16.49.205 with SMTP; 28 Jan 2003 15:52:51 -0000 Received: from nat-pool-rdu.redhat.com ([66.187.233.200] helo=lacrosse.corp.redhat.com) by monty-python.gnu.org with esmtp (Exim 4.10.13) id 18dY2R-0007JO-00 for gcc@gcc.gnu.org; Tue, 28 Jan 2003 10:52:39 -0500 Received: from tornado.toronto.redhat.com (IDENT:MDDGl2GEIYtOFBBVwFT3WBNCwFUHdX7P@tornado.toronto.redhat.com [172.16.14.228]) by lacrosse.corp.redhat.com (8.11.6/8.9.3) with ESMTP id h0SFpXg23337; Tue, 28 Jan 2003 10:51:33 -0500 Received: from tornado.toronto.redhat.com (localhost [127.0.0.1]) by tornado.toronto.redhat.com (8.12.5/8.12.5) with ESMTP id h0SFpWpw019482; Tue, 28 Jan 2003 10:51:33 -0500 Received: (from dnovillo@localhost) by tornado.toronto.redhat.com (8.12.5/8.12.5/Submit) id h0SFpWhP019480; Tue, 28 Jan 2003 10:51:32 -0500 Date: Tue, 28 Jan 2003 17:13:00 -0000 From: Diego Novillo To: Phil Edwards Cc: Gabriel Dos_Reis , gcc@gcc.gnu.org Subject: Re: [C++] Compile-Time Reflection Branch Message-ID: <20030128155132.GC19203@tornado.toronto.redhat.com> References: <15926.24530.387987.95771@perceval.inria.fr> <20030128132928.GA24054@disaster.jaj.com> Mime-Version: 1.0 Content-Type: text/plain; charset=iso-8859-1 Content-Disposition: inline In-Reply-To: <20030128132928.GA24054@disaster.jaj.com> User-Agent: Mutt/1.4i Organization: Red Hat Canada X-SW-Source: 2003-01/txt/msg01479.txt.bz2 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.