From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Miles Bader Newsgroups: gmane.emacs.devel Subject: Re: recent changes to org files Date: Tue, 23 Oct 2007 19:30:28 +0900 Message-ID: References: <8D11CC21-71C6-4BCE-ACBC-090E429E311A@science.uva.nl> Reply-To: Miles Bader NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: ger.gmane.org 1193135459 20896 80.91.229.12 (23 Oct 2007 10:30:59 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2007 10:30:59 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 23 12:30:58 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 1IkH29-00041x-DB for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 12:30:49 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IkH21-0005gz-4i for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 06:30:41 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IkH1w-0005eH-MW for emacs-devel@gnu.org; Tue, 23 Oct 2007 06:30:36 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IkH1v-0005cl-C1 for emacs-devel@gnu.org; Tue, 23 Oct 2007 06:30:36 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IkH1v-0005cg-5p for emacs-devel@gnu.org; Tue, 23 Oct 2007 06:30:35 -0400 Original-Received: from tyo201.gate.nec.co.jp ([202.32.8.193]) by monty-python.gnu.org with esmtp (Exim 4.60) (envelope-from ) id 1IkH1r-0005As-I4; Tue, 23 Oct 2007 06:30:32 -0400 Original-Received: from relay31.aps.necel.com ([10.29.19.54]) by tyo201.gate.nec.co.jp (8.13.8/8.13.4) with ESMTP id l9NAUTQb007885; Tue, 23 Oct 2007 19:30:29 +0900 (JST) Original-Received: from relay11.aps.necel.com ([10.29.19.24] [10.29.19.24]) by relay31.aps.necel.com with ESMTP; Tue, 23 Oct 2007 19:30:29 +0900 Original-Received: from dhapc248.dev.necel.com ([10.114.112.215] [10.114.112.215]) by relay11.aps.necel.com with ESMTP; Tue, 23 Oct 2007 19:30:29 +0900 Original-Received: by dhapc248.dev.necel.com (Postfix, from userid 31295) id 0E480B67; Tue, 23 Oct 2007 19:30:29 +0900 (JST) System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: <8D11CC21-71C6-4BCE-ACBC-090E429E311A@science.uva.nl> (Carsten Dominik's message of "Tue\, 23 Oct 2007 11\:48\:50 +0200") Original-Lines: 23 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:81539 Archived-At: Carsten Dominik writes: > 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. If you maintain an external copy of these files, it's indeed a good idea to arrange to be notified of changes in Emacs CVS. However, anybody who commits to Emacs CVS _must_ take care of merging issues in some way. That isn't something optional which depends on the whims of the file's author/maintainer and/or the existance of other copies of that file. If you see changes you don't like in Emacs CVS, then of course, those changes can be reverted -- but that should be an explicit and intentional action, not an implicit side-effect of being overwritten by some external "master" copy. -Miles -- Occam's razor split hairs so well, I bought the whole argument!