From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Bastien Newsgroups: gmane.emacs.devel Subject: Re: Merged Org 7.7 Date: Tue, 16 Aug 2011 09:28:54 +0200 Message-ID: <878vqtyfux.fsf@gnu.org> References: <87k4b2wgff.fsf@gnu.org> <0gmxfmtf4o.fsf@fencepost.gnu.org> <87k4aewwcb.fsf@gnu.org> <167h6e8ixm.fsf@fencepost.gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1313479703 27830 80.91.229.12 (16 Aug 2011 07:28:23 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Tue, 16 Aug 2011 07:28:23 +0000 (UTC) Cc: emacs-devel@gnu.org To: Glenn Morris Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Aug 16 09:28:19 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QtE4Q-0001I9-8G for ged-emacs-devel@m.gmane.org; Tue, 16 Aug 2011 09:28:18 +0200 Original-Received: from localhost ([::1]:40370 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtE4P-0004p1-AT for ged-emacs-devel@m.gmane.org; Tue, 16 Aug 2011 03:28:17 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:36343) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtE4N-0004ot-Hf for emacs-devel@gnu.org; Tue, 16 Aug 2011 03:28:16 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QtE4M-0000Au-M6 for emacs-devel@gnu.org; Tue, 16 Aug 2011 03:28:15 -0400 Original-Received: from mail-bw0-f41.google.com ([209.85.214.41]:49581) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QtE4M-0000Ai-Br; Tue, 16 Aug 2011 03:28:14 -0400 Original-Received: by bkbzt4 with SMTP id zt4so4055853bkb.0 for ; Tue, 16 Aug 2011 00:28:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlemail.com; s=gamma; h=sender:from:to:cc:subject:in-reply-to:references:user-agent:date :message-id:mime-version:content-type; bh=fbQ1jAimuBwwX5IqwfHZzyjhpwoikZADsISC6Q0DN4o=; b=h1ZGccBxAV6NRyBLp7sqn3EKwi1UuIPWG6WinpqhEXAKE01mZ6Hca1DXiqWE7G6zFx UeWYdzKUKRArwbmOS8YpNmbQQKFNIQncs7qV5upcPAGNboDglmZYTe+Ue/wuKk5WeQ7i vfR6wkV54hwAsn91nq12PbtykIxlcgwLc9TY8= Original-Received: by 10.204.170.130 with SMTP id d2mr1195808bkz.237.1313479693239; Tue, 16 Aug 2011 00:28:13 -0700 (PDT) Original-Received: from myhost.localdomain (fon75-1-78-192-119-5.fbxo.proxad.net [78.192.119.5]) by mx.google.com with ESMTPS id x1sm2673812fah.0.2011.08.16.00.28.11 (version=TLSv1/SSLv3 cipher=OTHER); Tue, 16 Aug 2011 00:28:12 -0700 (PDT) Original-Received: by myhost.localdomain (Postfix, from userid 1000) id B4FF6604B; Tue, 16 Aug 2011 09:28:54 +0200 (CEST) In-Reply-To: <167h6e8ixm.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 15 Aug 2011 17:27:01 -0400") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.214.41 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:143284 Archived-At: Glenn Morris writes: > Glenn Morris wrote: > >> But surely the right way to do it is to look at the diff before you do >> the Org merge and see that it doesn't have anything unexpected. > > And, rather than just copying the files from Org over the files in Emacs > (which is what I guess you are doing now), start by generating a diff > between current-version-of-Org and last-version-you-merged-to-Emacs, and > try to apply it to Emacs. I will do this for future merges, thanks for the idea. -- Bastien