From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Richard Stallman Newsgroups: gmane.emacs.devel Subject: Re: Merging multitty Date: Mon, 14 May 2007 04:08:48 -0400 Message-ID: References: <2wmz0iriyj.fsf@fencepost.gnu.org> <87fy65k6eh.fsf@red-bean.com> <853b25lk43.fsf@lola.goethe.zz> <86bqgr3g1h.fsf_-_@lola.quinscape.zz> <87k5vdse1d.fsf@catnip.gol.com> <17990.33223.288460.294949@kahikatea.snap.net.nz> <87ejlls8rl.fsf@catnip.gol.com> Reply-To: rms@gnu.org NNTP-Posting-Host: lo.gmane.org Content-Type: text/plain; charset=ISO-8859-15 X-Trace: sea.gmane.org 1179130464 29566 80.91.229.12 (14 May 2007 08:14:24 GMT) X-Complaints-To: usenet@sea.gmane.org NNTP-Posting-Date: Mon, 14 May 2007 08:14:24 +0000 (UTC) Cc: nickrob@snap.net.nz, miles.bader@necel.com, emacs-devel@gnu.org To: Miles Bader Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 14 10:14:22 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 1HnVhE-0001Kf-3Y for ged-emacs-devel@m.gmane.org; Mon, 14 May 2007 10:14:20 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HnVow-0001ta-74 for ged-emacs-devel@m.gmane.org; Mon, 14 May 2007 04:22:18 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1HnVmr-0000Ca-TA for emacs-devel@gnu.org; Mon, 14 May 2007 04:20:09 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1HnVmq-0000Bk-Lz for emacs-devel@gnu.org; Mon, 14 May 2007 04:20:09 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1HnVmq-0000Ba-EA for emacs-devel@gnu.org; Mon, 14 May 2007 04:20:08 -0400 Original-Received: from fencepost.gnu.org ([199.232.76.164]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1HnVf5-0001Ym-OM for emacs-devel@gnu.org; Mon, 14 May 2007 04:12:07 -0400 Original-Received: from rms by fencepost.gnu.org with local (Exim 4.60) (envelope-from ) id 1HnVbs-0008JB-6V; Mon, 14 May 2007 04:08:48 -0400 In-reply-to: <87ejlls8rl.fsf@catnip.gol.com> (message from Miles Bader on Sun, 13 May 2007 12:27:26 +0900) X-detected-kernel: Linux 2.6, seldom 2.4 (older, 4) 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:71005 Archived-At: The multi-tty branch has never been in CVS (anywhere), so you'll have to use arch to see historical log entries. That is not good. Please do not do it. What needs to be done is this: for each file, extract all its change log items from the arch changeset change logs (or from ChangLog), and use that as the CVS log for the file. > However, it might make sense to put them into a file in the tree for > non-arch users to peruse. That file is called ChangeLog. "Merged XYZ branch" is not acceptable in ChangeLog as a substitute for the actual change log entries. If the file ChangeLog has not been maintained for the multi-tty branch, then part of putting it into the Emacs repository is creating the necessary ChangeLog entries. Ok, I've put the multi-tty sources into CVS and arch branches on savannah. Did you do it right, as described above? If not, it has to be done over.