From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: David Kastrup Newsgroups: gmane.emacs.devel Subject: Re: recent changes to org files Date: Tue, 23 Oct 2007 12:08:17 +0200 Message-ID: <86k5pe6t4e.fsf@lola.quinscape.zz> References: <8D11CC21-71C6-4BCE-ACBC-090E429E311A@science.uva.nl> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1193134114 16337 80.91.229.12 (23 Oct 2007 10:08:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2007 10:08:34 +0000 (UTC) Cc: John Wiegley , Stefan Monnier , Glenn Morris , emacs-devel@gnu.org To: Carsten Dominik Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 23 12:08:33 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 1IkGgb-00057P-4U for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 12:08:33 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IkGgT-0001hD-5E for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 06:08:25 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IkGgQ-0001fZ-68 for emacs-devel@gnu.org; Tue, 23 Oct 2007 06:08:22 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IkGgP-0001dy-3T for emacs-devel@gnu.org; Tue, 23 Oct 2007 06:08:21 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IkGgO-0001dW-Sd for emacs-devel@gnu.org; Tue, 23 Oct 2007 06:08:20 -0400 Original-Received: from pc3.berlin.powerweb.de ([62.67.228.11]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IkGgN-0006eq-P1 for emacs-devel@gnu.org; Tue, 23 Oct 2007 06:08:20 -0400 Original-Received: from quinscape.de (dslnet.212-29-44.ip210.dokom.de [212.29.44.210] (may be forged)) by pc3.berlin.powerweb.de (8.9.3p3/8.9.3) with ESMTP id MAA10993 for ; Tue, 23 Oct 2007 12:08:16 +0200 X-Delivered-To: Original-Received: (qmail 2529 invoked from network); 23 Oct 2007 10:08:18 -0000 Original-Received: from localhost (quinx.quinscape.de [127.0.0.1]) by quinx.quinscape.de (AvMailGate-2.1.3-2) id 2524-8Jyxny; Di, 23 Okt 2007 12:08:18 +0200 (CEST) Original-Received: from unknown (HELO lola.quinscape.zz) ([10.0.3.43]) (envelope-sender ) by ns.quinscape.de (qmail-ldap-1.03) with SMTP for ; 23 Oct 2007 10:08:18 -0000 Original-Received: by lola.quinscape.zz (Postfix, from userid 1001) id 4C8038F289; Tue, 23 Oct 2007 12:08:17 +0200 (CEST) In-Reply-To: <8D11CC21-71C6-4BCE-ACBC-090E429E311A@science.uva.nl> (Carsten Dominik's message of "Tue\, 23 Oct 2007 11\:48\:50 +0200") User-Agent: Gnus/5.11 (Gnus v5.11) Emacs/23.0.50 (gnu/linux) X-AntiVirus: checked by AntiVir MailGate (version: 2.1.3-2; AVE: 7.6.0.27; VDF: 7.0.0.121; host: quinx) X-detected-kernel: by monty-python.gnu.org: Linux 2.4-2.6 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:81538 Archived-At: Carsten Dominik writes: >> 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. > > > To me it works like this: My copy is the master copy, not the one in > Emacs. The best setup for me would be to get email notifications, > maybe with a patch, whenever some Emacs developer touches my files > in Emacs. Then I can decide if I agree with these changes and > incorporate the accepted part into my master copy. But this does not change that any changes by Emacs developers to the copy in Emacs have been put there in the course of Emacs development and with the usual amount of peer review for patches. It is certainly your choice to accept those patches (or not) into your master copy. However, that does not mean that this decision should result in clobbering the changes in the Emacs copy. It is never correct to do or undo changes in Emacs without Changelog entry and/or CVS log. And dissent over the desirability of some change should not result in "battling commits". So the right solution can never be just copying over existing files without any attempt of merging the changes or explaining why they were undone. My personal recommendation would be to use the git mirror of Emacs' CVS. Using gitk or a number of other git-related tools, it is dead easy to instantaneously view all changes done in Emacs (git keeps an impressively well-packed copy of the whole repository with the entire history locally), merge in your own changes and synchronize stuff. I think the going rate for the Linux kernel is about 50 patches per hour that get accepted by Linus Torvalds into upstream, so the toolchain is rather well-suited to this sort of thing. -- David Kastrup