From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: recent changes to org files Date: Mon, 22 Oct 2007 20:57:00 -0400 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1193101060 30674 80.91.229.12 (23 Oct 2007 00:57:40 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2007 00:57:40 +0000 (UTC) Cc: Glenn Morris , Carsten Dominik , emacs-devel@gnu.org To: John Wiegley Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 23 02:57:40 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 1Ik85T-0007vR-90 for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 02:57:39 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ik85L-0005Bt-MB for ged-emacs-devel@m.gmane.org; Mon, 22 Oct 2007 20:57:31 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ik84y-00053L-J0 for emacs-devel@gnu.org; Mon, 22 Oct 2007 20:57:08 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ik84w-00052D-Ky for emacs-devel@gnu.org; Mon, 22 Oct 2007 20:57:07 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ik84w-00052A-F3 for emacs-devel@gnu.org; Mon, 22 Oct 2007 20:57:06 -0400 Original-Received: from tomts20.bellnexxia.net ([209.226.175.74] helo=tomts20-srv.bellnexxia.net) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1Ik84r-0000cR-QA; Mon, 22 Oct 2007 20:57:02 -0400 Original-Received: from pastel.home ([74.12.205.156]) by tomts20-srv.bellnexxia.net (InterMail vM.5.01.06.13 201-253-122-130-113-20050324) with ESMTP id <20071023005700.OCHV8273.tomts20-srv.bellnexxia.net@pastel.home>; Mon, 22 Oct 2007 20:57:00 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 98C967FBC; Mon, 22 Oct 2007 20:57:00 -0400 (EDT) In-Reply-To: (John Wiegley's message of "Mon\, 22 Oct 2007 18\:57\:57 -0400") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux) X-detected-kernel: by monty-python.gnu.org: 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:81498 Archived-At: >> When you install changes to org files, will you please look at the actual >> diffs before you do so, and only apply the bits that make sense? > Hmm... I'm just installing what the author distributes. It was never > mentioned to me that the Emacs developers might be making changes directly to > his files without exporting those changes back to his own sources. > Perhaps it would be better if I left it to the author to merge any Emacs CVS > changes into his code and then check them in directly, rather than posting the > contents of his new releases verbatim to CVS. What do you think, Carsten? To me the rule goes as follows: I only install patches, not files. That usually takes core of those problems: if the author's version disagrees with the CVS version I get a conflict when I try to apply the patch. Stefan