From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Glenn Morris Newsgroups: gmane.emacs.devel Subject: Re: Merged Org 7.7 Date: Mon, 15 Aug 2011 16:48:59 -0400 Message-ID: References: <87k4b2wgff.fsf@gnu.org> <0gmxfmtf4o.fsf@fencepost.gnu.org> <87k4aewwcb.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1313441351 2340 80.91.229.12 (15 Aug 2011 20:49:11 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Mon, 15 Aug 2011 20:49:11 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bastien Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Aug 15 22:49:06 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 1Qt45q-00033s-Db for ged-emacs-devel@m.gmane.org; Mon, 15 Aug 2011 22:49:06 +0200 Original-Received: from localhost ([::1]:47519 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qt45p-0000iJ-S5 for ged-emacs-devel@m.gmane.org; Mon, 15 Aug 2011 16:49:05 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:43493) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qt45n-0000hy-6c for emacs-devel@gnu.org; Mon, 15 Aug 2011 16:49:04 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Qt45m-0005Tc-7v for emacs-devel@gnu.org; Mon, 15 Aug 2011 16:49:03 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:55087) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qt45m-0005TY-59 for emacs-devel@gnu.org; Mon, 15 Aug 2011 16:49:02 -0400 Original-Received: from localhost ([127.0.0.1]:38732) by fencepost.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Qt45j-0005b5-IF; Mon, 15 Aug 2011 16:48:59 -0400 X-Spook: passwd anthrax Fortezza Sears Tower AGT. AMME emc USCOI X-Ran: ^+M}XH8@8hsTZnj`t#++EC^gDllb%Q[8~q (Glenn Morris's message of "Mon, 15 Aug 2011 16:35:58 -0400") User-Agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 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:143266 Archived-At: Glenn Morris wrote: >> Can you point me to the relevant mail on emacs-diff? > > Sure. > > http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html Oh, maybe you meant _my_ change. http://lists.gnu.org/archive/html/emacs-diffs/2011-08/msg00062.html http://lists.gnu.org/archive/html/emacs-diffs/2011-01/msg00156.html which are also unhelpful. There may have been other changes as well. You can find them with bzr log. 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. bzr diff -r 105336..105337 eg --- lisp/org/ob-C.el 2011-01-25 04:08:28 +0000 +++ lisp/org/ob-C.el 2011-07-28 15:13:49 +0000 @@ -1,11 +1,11 @@ ;;; ob-C.el --- org-babel functions for C and similar languages -;; Copyright (C) 2010-2011 Free Software Foundation, Inc. +;; Copyright (C) 2010 Free Software Foundation, Inc. ;; Author: Eric Schulte ;; Keywords: literate programming, reproducible research ;; Homepage: http://orgmode.org -;; Version: 7.4 +;; Version: 7.7 Obviously the problem is that the diff is so large that it is very difficult to check.