From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Carsten Dominik Newsgroups: gmane.emacs.devel Subject: Re: Updating org-mode in Emacs Date: Sat, 8 Aug 2009 13:54:24 +0200 Message-ID: <8224A94F-7944-4A27-A565-A9408F8BAF65@gmail.com> References: <5tvdkz8n25.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v935.3) Content-Type: text/plain; charset=US-ASCII; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1249732489 29997 80.91.229.12 (8 Aug 2009 11:54:49 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 8 Aug 2009 11:54:49 +0000 (UTC) Cc: Emacs developers To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Aug 08 13:54:42 2009 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 1MZkVW-0001aO-4Z for ged-emacs-devel@m.gmane.org; Sat, 08 Aug 2009 13:54:42 +0200 Original-Received: from localhost ([127.0.0.1]:46395 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZkVV-0006uy-M3 for ged-emacs-devel@m.gmane.org; Sat, 08 Aug 2009 07:54:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1MZkVR-0006us-4H for emacs-devel@gnu.org; Sat, 08 Aug 2009 07:54:37 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1MZkVL-0006ud-TE for emacs-devel@gnu.org; Sat, 08 Aug 2009 07:54:36 -0400 Original-Received: from [199.232.76.173] (port=40640 helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1MZkVL-0006ua-Pk for emacs-devel@gnu.org; Sat, 08 Aug 2009 07:54:31 -0400 Original-Received: from postduif.ic.uva.nl ([145.18.40.180]:49629) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1MZkVK-0008PE-2n; Sat, 08 Aug 2009 07:54:30 -0400 Original-Received: from [192.168.1.10] (dc5146846e.adsl.wanadoo.nl [81.70.132.110]) (authenticated bits=0) by postduif.ic.uva.nl (8.13.1/8.13.1) with ESMTP id n78BsOhb029137 (version=TLSv1/SSLv3 cipher=AES128-SHA bits=128 verify=NO); Sat, 8 Aug 2009 13:54:26 +0200 In-Reply-To: <5tvdkz8n25.fsf@fencepost.gnu.org> X-Mailer: Apple Mail (2.935.3) X-Spam-Score: undef - spam scanning disabled X-CanIt-Geo: ip=81.70.132.110; country=NL; region=16; city=Zeewolde; latitude=52.3667; longitude=5.5500; http://maps.google.com/maps?q=52.3667,5.5500&z=6 X-CanItPRO-Stream: auth (inherits from default) X-Canit-Stats-ID: Bayes signature not available X-Scanned-By: CanIt (www . roaringpenguin . com) on 145.18.40.180 X-detected-operating-system: by monty-python.gnu.org: GNU/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:113801 Archived-At: On Aug 7, 2009, at 9:02 PM, Glenn Morris wrote: > Carsten Dominik wrote: > >> So: I want to install a massive update to Org-mode, in a few days. > > Once again, this has clobbered existing changes made to Org in the > Emacs CVS. For example, my changes to org-rmail. This seems to happen > every time Org gets updated. > > I don't have the heart to investigate further exactly what may have > been lost in other files, since the changes appear as a single, 40000 > line diff, with a single commmon, massive CVS commit log that just > duplicates the ChangeLog. I'm aware that this is the commit style > recommended by some people, but I find it unreadable with CVS. What am I supposed to do if I cannot commit to Emacs for a long time because of feature freeze and pretest, and if in the mean time the changes accumulate to this amount? I don't know a different way, most certainly not using CVS. Also, what else should I put into the commit message? A long time ago it was explained to me that this is *exactly* what should be in there. - Carsten