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 13:54:41 +0200 Message-ID: References: <8D11CC21-71C6-4BCE-ACBC-090E429E311A@science.uva.nl> <86k5pe6t4e.fsf@lola.quinscape.zz> <1100BA17-7426-4C73-9EF0-FF90C1859B47@gmail.com> <12EC2A79-9F93-4080-AB48-A9E408DEBD3A@gmail.com> 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 1193140504 5293 80.91.229.12 (23 Oct 2007 11:55:04 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2007 11:55:04 +0000 (UTC) Cc: John Wiegley , emacs-devel@gnu.org, Stefan Monnier , Glenn Morris To: Juanma Barranquero Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 23 13:55:04 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 1IkILe-0006hM-AX for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 13:55:02 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IkILW-0003jF-JM for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 07:54:54 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1IkILR-0003eY-Tv for emacs-devel@gnu.org; Tue, 23 Oct 2007 07:54:50 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1IkILQ-0003al-2V for emacs-devel@gnu.org; Tue, 23 Oct 2007 07:54:49 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1IkILP-0003aL-R8 for emacs-devel@gnu.org; Tue, 23 Oct 2007 07:54:47 -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 1IkILP-0006jp-64 for emacs-devel@gnu.org; Tue, 23 Oct 2007 07:54:47 -0400 Original-Received: by ug-out-1314.google.com with SMTP id a2so117810ugf for ; Tue, 23 Oct 2007 04:54:46 -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:from:subject:date:to:x-mailer; bh=k2RYVDOa4GRyH8zR57OTO6LR3IXupPKeTKM42uD+/gw=; b=NtVEB3NFzSFZEhoviTnNTTY9RFjtxLlJLRfQtWO/A9cWiHNnQREYy3zyxv6Q2ys4wHfexUZhEZn3rg+qmO2+1dk9gKHOUOO/emkq5lrEbIAkqKWnP+tPCu4TE/CNMnlGWjkiKeOW/nPdszjTbzYYR0+O7puP0uOZtqmhO4J5fZs= 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:from:subject:date:to:x-mailer; b=d7e5wNV6rG1zSUsfvDCvC51HJFagdW7Vt0mhR5oxoKRZLJXRo6Mmc03xr1pNM+jqeAw+evOu754+GPE6TnkM8ewbXFE3O3vasrcXr81gOwMGBRZqFnZxfSOUHmSbidTu7ulK4PVZP81HLJRulTU1aeutHB6Rnz8zj7tD7qCrgcs= Original-Received: by 10.66.221.6 with SMTP id t6mr759183ugg.1193140486217; Tue, 23 Oct 2007 04:54:46 -0700 (PDT) Original-Received: from ?146.50.22.167? ( [146.50.22.167]) by mx.google.com with ESMTPS id k1sm1453560ugf.2007.10.23.04.54.43 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 23 Oct 2007 04:54:44 -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:81555 Archived-At: On Oct 23, 2007, at 1:44 PM, Juanma Barranquero wrote: > On 10/23/07, Carsten Dominik wrote: > >> No, I am not saying anything like this. > > Then please interpret this for me: > >> If I would follow Stefan' advice and only check in diffs, >> the `next-line' code would be broken now. Stefan said in an earlier message: > 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. I was referring to this statement. It is not enough to install only patches, I also need to actively monitor changes that are made by others. There would have been no conflict when checking in a patch with my latest modifications. - Carsten