From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ralf Angeli Newsgroups: gmane.emacs.devel Subject: Re: RefTeX Merge Date: Sun, 30 Sep 2012 22:46:04 +0200 Message-ID: <87bognqlwz.fsf@caeruleus.net> References: <877grkehl2.fsf@caeruleus.net> <505F574D.1050707@cs.ucla.edu> <876274lzio.fsf@gnu.org> <871uhri21g.fsf@caeruleus.net> <87ehlphypr.fsf@gnu.org> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1349037971 9619 80.91.229.3 (30 Sep 2012 20:46:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sun, 30 Sep 2012 20:46:11 +0000 (UTC) Cc: emacs-devel@gnu.org To: Chong Yidong Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun Sep 30 22:46:17 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 1TIQP3-00079S-1n for ged-emacs-devel@m.gmane.org; Sun, 30 Sep 2012 22:46:17 +0200 Original-Received: from localhost ([::1]:37850 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIQOx-0002FP-JI for ged-emacs-devel@m.gmane.org; Sun, 30 Sep 2012 16:46:11 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:46447) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIQOu-0002FF-Uh for emacs-devel@gnu.org; Sun, 30 Sep 2012 16:46:10 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TIQOt-00052A-JP for emacs-devel@gnu.org; Sun, 30 Sep 2012 16:46:08 -0400 Original-Received: from moutng.kundenserver.de ([212.227.126.187]:54056) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TIQOt-00051f-AK; Sun, 30 Sep 2012 16:46:07 -0400 Original-Received: from photon (p54A50994.dip0.t-ipconnect.de [84.165.9.148]) by mrelayeu.kundenserver.de (node=mreu4) with ESMTP (Nemesis) id 0M1uF5-1TYZGw18e3-00u2yJ; Sun, 30 Sep 2012 22:46:05 +0200 In-Reply-To: <87ehlphypr.fsf@gnu.org> (Chong Yidong's message of "Wed, 26 Sep 2012 18:20:48 +0800") X-Provags-ID: V02:K0:BGOC0QCC79KIU4KTi5R9x0Tz4hd5sRxRsz/YhjDN/MW Obd6Z3VSzskaXyfcmkqYYt4KLvQ3rST+uxHOZYGE+hvpim4uJj zhTI0gNx+5LlK6ZZPlsMuxC2x7lS0Xgs2mp8s5mHrhse/DiB9U 4TgSLvFTaBA9ds8bjx6vHQmcr3yeFJxPDkCVeHBvtPIquBZpYo RVB1D8wUds/FLXGeTxQL1f5k3aTULJXUe8jx6ciEspoSyvy19F Skb1f4YH1NHLjso2tCBVlVHOxJm7HhzoJ8LvvWTLMhDrehZoDx U4R7jZcHeAdxXTc4TwJ3IGABMJJknhb/7PFf4ADmmNCfXT9Sw= = X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 212.227.126.187 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:153779 Archived-At: * Chong Yidong (2012-09-26) writes: > Ralf Angeli writes: > >> 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. It got about 100 lines more. I hope this is not a problem. At least bzr didn't barf. > 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. In the ChangeLog about 140 lines ended up. Again, I hope this is okay. If necessary I can try to shave of a few. > 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. I've made some experiments with `bzr join' and I haven't really had success. That's why I committed the changes as suggested above. Thanks a lot to the people commenting on the topic for all the hints and feedback. -- Ralf