From: Glenn Morris <rgm@gnu.org>
To: Bastien <bzg@altern.org>
Cc: emacs-devel@gnu.org
Subject: Re: Merged Org 7.7
Date: Mon, 15 Aug 2011 16:48:59 -0400 [thread overview]
Message-ID: <hvr54mmmdg.fsf@fencepost.gnu.org> (raw)
In-Reply-To: <jmzkjammz5.fsf@fencepost.gnu.org> (Glenn Morris's message of "Mon, 15 Aug 2011 16:35:58 -0400")
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.
next prev parent reply other threads:[~2011-08-15 20:48 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 15:52 Merged Org 7.7 Bastien
2011-08-06 21:16 ` Glenn Morris
2011-08-06 21:27 ` Glenn Morris
2011-08-06 21:55 ` Glenn Morris
2011-08-15 14:41 ` Bastien
2011-08-15 14:57 ` Bastien
2011-08-15 21:05 ` Glenn Morris
2011-08-16 7:14 ` Bastien
2011-08-15 15:00 ` Bastien
2011-08-15 20:38 ` Glenn Morris
2011-08-16 7:14 ` Bastien
2011-08-15 17:15 ` Eduard Wiebe
2011-08-15 17:49 ` Bastien
2011-08-15 15:03 ` Bastien
2011-08-15 20:35 ` Glenn Morris
2011-08-15 20:48 ` Glenn Morris [this message]
2011-08-15 21:27 ` Glenn Morris
2011-08-16 7:28 ` Bastien
2011-08-15 23:18 ` Bastien
2011-08-17 18:04 ` Glenn Morris
2011-08-18 7:52 ` Bastien
2011-08-18 20:59 ` Glenn Morris
2011-08-19 12:55 ` Bastien
2011-08-15 15:05 ` Bastien
2011-08-15 18:07 ` Paul Eggert
2011-08-17 12:43 ` Bastien
2011-08-16 7:15 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=hvr54mmmdg.fsf@fencepost.gnu.org \
--to=rgm@gnu.org \
--cc=bzg@altern.org \
--cc=emacs-devel@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).