[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Merged Org 7.7

From: Glenn Morris
Subject: Re: Merged Org 7.7
Date: Mon, 15 Aug 2011 16:48:59 -0400
User-agent: Gnus (www.gnus.org), GNU Emacs (www.gnu.org/software/emacs/)

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.


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


--- 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.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]