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: recent changes to org files Date: Tue, 23 Oct 2007 11:48:50 +0200 Message-ID: <8D11CC21-71C6-4BCE-ACBC-090E429E311A@science.uva.nl> References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 (Apple Message framework v752.2) Content-Type: text/plain; charset=US-ASCII; delsp=yes; format=flowed Content-Transfer-Encoding: 7bit X-Trace: ger.gmane.org 1193132953 12502 80.91.229.12 (23 Oct 2007 09:49:13 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2007 09:49:13 +0000 (UTC) Cc: John Wiegley , emacs-devel@gnu.org, Glenn Morris To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 23 11:49:14 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 1IkGNt-0007dp-2z for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 11:49:13 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IkGNk-0002SL-Ga for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 05:49:04 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IkGNg-0002PY-SP for emacs-devel@gnu.org; Tue, 23 Oct 2007 05:49:00 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IkGNe-0002MJ-Ke for emacs-devel@gnu.org; Tue, 23 Oct 2007 05:49:00 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IkGNe-0002Lv-8u for emacs-devel@gnu.org; Tue, 23 Oct 2007 05:48:58 -0400 Original-Received: from ug-out-1314.google.com ([66.249.92.168]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IkGNd-0000kl-7G for emacs-devel@gnu.org; Tue, 23 Oct 2007 05:48:57 -0400 Original-Received: by ug-out-1314.google.com with SMTP id a2so99616ugf for ; Tue, 23 Oct 2007 02:48:55 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:in-reply-to:references:mime-version:content-type:message-id:cc:content-transfer-encoding:subject:date:to:x-mailer:from; bh=jAIwktM/A+JhDBF7Ij/DpWSHQsBYJ3/7WjZJXmBvEkA=; b=iZ9Pixn8ESgN+BOdP5o6gAU5kPb3iZ4Z3uoY/T2dJyaJ2Gee7hxIJytsSsOiVxJ/OjbSYbUvxTMG8TIno+SbuPjuAiejeACdqC0YoTaHmrGwtgr1cvMoIlWOmLQuNxfitQ0iwiS2IWC/A3efJxD78ApjJBcU7otJUUW7NeYEaI4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:in-reply-to:references:mime-version:content-type:message-id:cc:content-transfer-encoding:subject:date:to:x-mailer:from; b=T9IS+fWnE+mdJyY4QHgR+Swy1OSfZNHuFs683HcnxZQqvnyfel9jem+HfB9b9U1qxYY/dEf3OVQ09g1KFMImR3BvD86cznxGfexcGyzHDl1x+TdmOrz6mmFrL3XrBcm4m/N1GF68uwfd86upy5vxLdl6IgKUUu6SGV0lJukltko= Original-Received: by 10.66.221.6 with SMTP id t6mr656181ugg.1193132935629; Tue, 23 Oct 2007 02:48:55 -0700 (PDT) Original-Received: from ?146.50.22.167? ( [146.50.22.167]) by mx.google.com with ESMTPS id 31sm1289022ugg.2007.10.23.02.48.53 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Oct 2007 02:48:53 -0700 (PDT) In-Reply-To: X-Mailer: Apple Mail (2.752.2) X-detected-kernel: by monty-python.gnu.org: Linux 2.6 (newer, 2) 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:81536 Archived-At: > 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. - Carsten