From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Chong Yidong Newsgroups: gmane.emacs.devel Subject: Re: RefTeX Merge Date: Wed, 26 Sep 2012 18:20:48 +0800 Message-ID: <87ehlphypr.fsf@gnu.org> References: <877grkehl2.fsf@caeruleus.net> <505F574D.1050707@cs.ucla.edu> <876274lzio.fsf@gnu.org> <871uhri21g.fsf@caeruleus.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1348654868 6991 80.91.229.3 (26 Sep 2012 10:21:08 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 26 Sep 2012 10:21:08 +0000 (UTC) Cc: Paul Eggert , emacs-devel@gnu.org To: Ralf Angeli Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Sep 26 12:21:11 2012 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1TGoju-0008Kb-R0 for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 12:21:10 +0200 Original-Received: from localhost ([::1]:48773 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGojp-00061K-OS for ged-emacs-devel@m.gmane.org; Wed, 26 Sep 2012 06:21:05 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45819) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGojm-00060L-PH for emacs-devel@gnu.org; Wed, 26 Sep 2012 06:21:03 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TGojg-0000Ot-L6 for emacs-devel@gnu.org; Wed, 26 Sep 2012 06:21:02 -0400 Original-Received: from mail-pb0-f41.google.com ([209.85.160.41]:64953) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TGojg-0000ME-EU for emacs-devel@gnu.org; Wed, 26 Sep 2012 06:20:56 -0400 Original-Received: by pbbrq2 with SMTP id rq2so1803828pbb.0 for ; Wed, 26 Sep 2012 03:20:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:references:date:in-reply-to:message-id :user-agent:mime-version:content-type; bh=zHyGSNxwd30JuxkAGMc6sKM6mkmuj2kHzhSDuUski38=; b=cccz5Y6+S3YeR1nJZpiZ40Y/gXg4LaOAG48g0DrhMXu0/akXfu1ar1D6tnDaMmdakn Jv5jHQJlTdfulcTSy95nSQHBPPVhQs/XxvMBAqOAKGEJ4NZ8PiK6mrbDvtvjBZYgk6mH FSXAfjjZguKtFdhh/io1MHhs9oCj1W0nGrwhe14kaBQYpsUvmODRN1u6tbRUMYlILhq0 mmLN2vSr3J4quuE0uMOcu8BgVXnO9xa3xESfIEdTAZc1U33YQXnZhn76YypPdlf0JJ0n y2Y0dMQknS9wba4vG0ZW0fJk5ki4Zx5YxjrpTFAKKTyxHDdHcvpI/UK0JfsWjSHq4jWN F8Wg== Original-Received: by 10.68.134.97 with SMTP id pj1mr1310130pbb.55.1348654855235; Wed, 26 Sep 2012 03:20:55 -0700 (PDT) Original-Received: from ulysses ([155.69.17.71]) by mx.google.com with ESMTPS id pj10sm1851530pbb.46.2012.09.26.03.20.51 (version=SSLv3 cipher=OTHER); Wed, 26 Sep 2012 03:20:53 -0700 (PDT) In-Reply-To: <871uhri21g.fsf@caeruleus.net> (Ralf Angeli's message of "Mon, 24 Sep 2012 22:44:27 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.160.41 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:153568 Archived-At: Ralf Angeli writes: >> No. Since reftex.el is one file, it is not worth creating a >> subdirectory just for it. > > RefTeX consists of eleven Lisp files. It might not be a bad idea to put > them into their own directory. Sorry, my mistake. But I have to agree with RMS; it still doesn't seem worth giving reftex its own subdirectory. >> Putting them in the commit log may be a fine solution. > > If the log can take such amount of data, then I would be fine with it. > And besides that I'd prepare a shorter entry for the ChangeLog file. >From my estimation, once you take out entries for Makefile changes, releases, and synchs to Emacs, the ChangeLog is about 400 lines, which is manageable. So I think we can put it in the commit log. In the version to be added to the ChangeLog file, you can collate the changes to each file, which should shorten the entry significantly. Still, I think a ChangeLog entry of ~100 lines is acceptable. >> (Normally, one would use bzr join to >> preserve the history, but bzr join seems to be badly broken.) > > Now that would be a nice solution. RefTeX is currently maintained in > a CVS repository, though. I'm not sure if this makes matters better > or worse. Let's not play with bzr join. We've had bad experiences with that on the elpa branch. I suggest just patching the affected files manually, then committing as though you had made the changes in one shot. Just be sure not to inadvertently change the headers (e.g. "This file is part of GNU Emacs") and so forth.