emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
From: Jambunathan K <kjambunathan@gmail.com>
To: mail@christianmoe.com
Cc: Bastien <bzg@altern.org>, emacs-orgmode@gnu.org
Subject: Re: [PATCH][ANN] org-html/org-odt
Date: Mon, 21 Mar 2011 15:10:59 +0530	[thread overview]
Message-ID: <81r5a095g4.fsf@gmail.com> (raw)
In-Reply-To: <4D871223.1060004@christianmoe.com> (Christian Moe's message of "Mon, 21 Mar 2011 09:53:55 +0100")

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.

  parent reply	other threads:[~2011-03-21  9:41 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-20 18:32 [PATCH][ANN] org-html/org-odt Jambunathan K
2011-03-21  8:21 ` Bastien
2011-03-21  8:53   ` Christian Moe
2011-03-21  9:31     ` Jambunathan K
2011-03-21 11:06       ` Christian Moe
2011-03-21 13:31         ` Jambunathan K
2011-03-21 15:20           ` Christian Moe
2011-03-21 16:39             ` Jambunathan K
2011-03-21 19:38             ` Jambunathan K
2011-03-21  9:40     ` Jambunathan K [this message]
2011-03-21  8:55   ` Jambunathan K
2011-03-21 10:03 ` Jambunathan K
2011-03-21 21:26 ` Christian Moe
2011-04-12  8:33   ` Jambunathan K
2011-04-12 14:47     ` Christian Moe
2011-04-25 12:47     ` Christian Moe
2011-04-26 16:09       ` Jambunathan K
2011-03-25 22:32 ` Sean O'Halpin
2011-03-26  4:57   ` Jambunathan K
2011-04-15 20:39 ` [PATCH][ANN] org-html/org-odt/org-docbook Jambunathan K
2011-04-30  6:06 ` [PATCH][ANN] org-html/org-odt Jambunathan K
2011-04-30  6:54   ` Christian Moe
2011-05-01 12:52   ` Matt Lundin
2011-05-01 13:31     ` Matt Lundin
2011-05-02  6:00     ` Jambunathan K
2011-05-18 23:18 ` [ANN] ELPA Repo for org-html/org-odt Jambunathan K
2011-05-18 23:21   ` Jambunathan K
2011-05-19  4:58     ` suvayu ali
2011-05-19  5:29       ` Jambunathan K
2011-05-19  6:52         ` suvayu ali
2011-05-24 13:41           ` Jambunathan K
  -- strict thread matches above, loose matches on Subject: below --
2011-03-21  9:32 [PATCH][ANN] org-html/org-odt Rustom Mody
2011-03-21  9:51 ` Jambunathan K

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.orgmode.org/

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=81r5a095g4.fsf@gmail.com \
    --to=kjambunathan@gmail.com \
    --cc=bzg@altern.org \
    --cc=emacs-orgmode@gnu.org \
    --cc=mail@christianmoe.com \
    /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/org-mode.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).