From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Kevin Ryde Newsgroups: gmane.lisp.guile.devel Subject: Re: another merge from 1.8 Date: Tue, 30 Jan 2007 11:34:59 +1100 Message-ID: <87ac018i8c.fsf@zip.com.au> References: <87tzyru985.fsf@zip.com.au> <87r6ttl0h7.fsf@ossau.uklinux.net> <87odovappg.fsf@zip.com.au> <87tzybxedx.fsf@ossau.uklinux.net> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1170117325 10544 80.91.229.12 (30 Jan 2007 00:35:25 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Tue, 30 Jan 2007 00:35:25 +0000 (UTC) Cc: guile-devel@gnu.org To: Neil Jerram Original-X-From: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Tue Jan 30 01:35:23 2007 Return-path: Envelope-to: guile-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1HBgy2-00048w-Sn for guile-devel@m.gmane.org; Tue, 30 Jan 2007 01:35:23 +0100 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HBgy2-0008Vk-EQ for guile-devel@m.gmane.org; Mon, 29 Jan 2007 19:35:22 -0500 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HBgxy-0008VS-36 for guile-devel@gnu.org; Mon, 29 Jan 2007 19:35:18 -0500 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HBgxw-0008V5-UQ for guile-devel@gnu.org; Mon, 29 Jan 2007 19:35:17 -0500 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HBgxw-0008V1-Er for guile-devel@gnu.org; Mon, 29 Jan 2007 19:35:16 -0500 Original-Received: from mailout2-8.pacific.net.au ([61.8.2.231] helo=mailout2.pacific.net.au) by monty-python.gnu.org with esmtp (Exim 4.52) id 1HBgxv-000631-VS for guile-devel@gnu.org; Mon, 29 Jan 2007 19:35:16 -0500 Original-Received: from mailproxy1.pacific.net.au (mailproxy1.pacific.net.au [61.8.2.162]) by mailout2.pacific.net.au (Postfix) with ESMTP id 8E3D76E11B; Tue, 30 Jan 2007 11:35:09 +1100 (EST) Original-Received: from localhost (ppp2284.dyn.pacific.net.au [61.8.34.132]) by mailproxy1.pacific.net.au (Postfix) with ESMTP id 9A1138C04; Tue, 30 Jan 2007 11:35:11 +1100 (EST) Original-Received: from gg by localhost with local (Exim 4.63) (envelope-from ) id 1HBgxf-0005q9-Im; Tue, 30 Jan 2007 11:34:59 +1100 Mail-Copies-To: never In-Reply-To: <87tzybxedx.fsf@ossau.uklinux.net> (Neil Jerram's message of "Sun, 28 Jan 2007 17:14:18 +0000") User-Agent: Gnus/5.110006 (No Gnus v0.6) Emacs/21.4 (gnu/linux) X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) X-BeenThere: guile-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Developers list for Guile, the GNU extensibility library" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Errors-To: guile-devel-bounces+guile-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.lisp.guile.devel:6502 Archived-At: Neil Jerram writes: > > One detail of the merging... I gather we're preferring to merge > ChangeLog fragments directly, so as to minimize the diffs between the > ChangeLogs in two branches, Yep. > This seems fine to me, but it does mean we lose info about when the > change was actually added to the target branch. Shouldn't matter, usually, hopefully. > (Merged from CVS HEAD on 2007-01-28.) Sounds fine for a back-merge like this (I wouldn't see a need in a forward merge though). > I also had to specify a new encoding for the 1.8 ChangeLogs, Is that when you let emacs do a merge or update? The same happened to me and it offered some strange diffs. Ludovic put the right local var, but I suspect emacs doesn't look at it on the first C-x v v that brings it into the working copy. _______________________________________________ Guile-devel mailing list Guile-devel@gnu.org http://lists.gnu.org/mailman/listinfo/guile-devel