From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: merging etc Date: Fri, 24 Aug 2007 17:37:05 +0900 Message-ID: References: <200708211523.l7LFNnVl000876@oogie-boogie.ics.uci.edu> <200708220820.l7M8KbIt026014@oogie-boogie.ics.uci.edu> <87lkc3qe2z.fsf@jurta.org> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: sea.gmane.org 1187944648 11400 80.91.229.12 (24 Aug 2007 08:37:28 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Fri, 24 Aug 2007 08:37:28 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Aug 24 10:37:27 2007 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.50) id 1IOUfV-000506-V1 for ged-emacs-devel@m.gmane.org; Fri, 24 Aug 2007 10:37:26 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOUfV-0001me-4l for ged-emacs-devel@m.gmane.org; Fri, 24 Aug 2007 04:37:25 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IOUfR-0001lf-C2 for emacs-devel@gnu.org; Fri, 24 Aug 2007 04:37:21 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IOUfP-0001j4-L4 for emacs-devel@gnu.org; Fri, 24 Aug 2007 04:37:20 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IOUfP-0001if-4n for emacs-devel@gnu.org; Fri, 24 Aug 2007 04:37:19 -0400 Original-Received: from tyo201.gate.nec.co.jp ([202.32.8.193]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IOUfK-0005fF-ME; Fri, 24 Aug 2007 04:37:15 -0400 Original-Received: from relay11.aps.necel.com ([10.29.19.46]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id l7O8b66R004545; Fri, 24 Aug 2007 17:37:06 +0900 (JST) Original-Received: from relay31.aps.necel.com ([10.29.19.16] [10.29.19.16]) by relay11.aps.necel.com with ESMTP; Fri, 24 Aug 2007 17:37:05 +0900 Original-Received: from dhapc248.dev.necel.com ([10.114.98.116] [10.114.98.116]) by relay31.aps.necel.com with ESMTP; Fri, 24 Aug 2007 17:37:05 +0900 Original-Received: by dhapc248.dev.necel.com (Postfix, from userid 31295) id 9B7DC56; Fri, 24 Aug 2007 17:37:05 +0900 (JST) System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: (joakim@verona.se's message of "Fri\, 24 Aug 2007 10\:01\:36 +0200") Original-Lines: 12 X-Detected-Kernel: Solaris 8 (1) X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:77076 Archived-At: joakim@verona.se writes: > I wouldn't do the merging this way myself. (I hope the mtty history > wont be lost this way, that would really not be very good) The raw(ish) changelog entries are already in CVS on the multi-tty branch (in per-directory "ChangeLog.multi-tty" files), so in that sense, at least, the history won't be "lost".... -miles -- "Suppose we've chosen the wrong god. Every time we go to church we're just making him madder and madder." -- Homer Simpson