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 11:11:50 +0900 Message-ID: References: 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 1193105531 9378 80.91.229.12 (23 Oct 2007 02:12:11 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 23 Oct 2007 02:12:11 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Oct 23 04:12:12 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 1Ik9Fa-0005oO-AL for ged-emacs-devel@m.gmane.org; Tue, 23 Oct 2007 04:12:10 +0200 Original-Received: from localhost ([127.0.0.1] helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ik9FS-0003b0-30 for ged-emacs-devel@m.gmane.org; Mon, 22 Oct 2007 22:12:02 -0400 Original-Received: from mailman by lists.gnu.org with tmda-scanned (Exim 4.43) id 1Ik9FP-0003Yz-6y for emacs-devel@gnu.org; Mon, 22 Oct 2007 22:11:59 -0400 Original-Received: from exim by lists.gnu.org with spam-scanned (Exim 4.43) id 1Ik9FN-0003WG-D7 for emacs-devel@gnu.org; Mon, 22 Oct 2007 22:11:58 -0400 Original-Received: from [199.232.76.173] (helo=monty-python.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1Ik9FN-0003WB-9n for emacs-devel@gnu.org; Mon, 22 Oct 2007 22:11:57 -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 1Ik9FK-0004JK-3s; Mon, 22 Oct 2007 22:11:54 -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 l9N2Bpch007201; Tue, 23 Oct 2007 11:11:51 +0900 (JST) Original-Received: from relay31.aps.necel.com ([10.29.19.24] [10.29.19.24]) by relay31.aps.necel.com with ESMTP; Tue, 23 Oct 2007 11:11:50 +0900 Original-Received: from dhapc248.dev.necel.com ([10.114.112.215] [10.114.112.215]) by relay31.aps.necel.com with ESMTP; Tue, 23 Oct 2007 11:11:50 +0900 Original-Received: by dhapc248.dev.necel.com (Postfix, from userid 31295) id C6A3551A; Tue, 23 Oct 2007 11:11:50 +0900 (JST) System-Type: i686-pc-linux-gnu Blat: Foop In-Reply-To: (John Wiegley's message of "Mon\, 22 Oct 2007 18\:57\:57 -0400") Original-Lines: 11 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:81503 Archived-At: John Wiegley writes: > Hmm... I'm just installing what the author distributes. Don't do that. Always think of committing files as merging changes, unless you are very sure of the file's history, and have a good reason to disregard changes made to CVS. -Miles -- Ich bin ein Virus. Mach' mit und kopiere mich in Deine .signature.