From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jambunathan K <kjambunathan@gmail.com>
Subject: Re: [PATCH][ANN] org-html/org-odt
Date: Mon, 21 Mar 2011 15:10:59 +0530
Message-ID: <81r5a095g4.fsf@gmail.com>
References: <811v21sjy9.fsf@gmail.com> <87y648sx2a.fsf@gnu.org>
	<4D871223.1060004@christianmoe.com>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=40426 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1Q1bbu-0002G6-Ji
	for emacs-orgmode@gnu.org; Mon, 21 Mar 2011 05:41:15 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <kjambunathan@gmail.com>) id 1Q1bbs-000252-IA
	for emacs-orgmode@gnu.org; Mon, 21 Mar 2011 05:41:13 -0400
Received: from mail-iw0-f169.google.com ([209.85.214.169]:49327)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <kjambunathan@gmail.com>) id 1Q1bbs-00024t-FH
	for emacs-orgmode@gnu.org; Mon, 21 Mar 2011 05:41:12 -0400
Received: by iwl42 with SMTP id 42so7862532iwl.0
	for <emacs-orgmode@gnu.org>; Mon, 21 Mar 2011 02:41:11 -0700 (PDT)
In-Reply-To: <4D871223.1060004@christianmoe.com> (Christian Moe's message of
	"Mon, 21 Mar 2011 09:53:55 +0100")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <http://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: mail@christianmoe.com
Cc: Bastien <bzg@altern.org>, emacs-orgmode@gnu.org

Christian Moe <mail@christianmoe.com> writes:

> Hi,
>
> I'd love to try it out, but I'm not good at git. Would someone be kind
> enough to post directions?
>
> I thought this would do it:
>
> git checkout 3d802
> git checkout -b ooo
> git apply
> ../0001-Re-implement-org-export-as-html-and-add-support-for-.patch
>
> But I got:
>
> error: patch failed: lisp/org.el:8711
> error: lisp/org.el: patch does not apply

One of the reasons the patch fails to apply is because I have hand
edited it and removed the hunks that correspond to new files (all
org-odt related). 

In my experience, `git apply' is quite intelligent in figuring out that
the patch has been tampered with. May be you should try plain old patch
utility.

#+begin_src sh
  patch < my.patch
#+end_src

should provide a good starting point. It is likely to ask some questions
just answer them.

As noted previously, I have stripped off all the odt related changes
from the patch I circulated. The patching route is recommended for
existing html users. The checkout route is recommended for html + odt
users.

Jambunathan K.