From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nick Dokos <nicholas.dokos@hp.com>
Subject: Re: [PATCH] Apply patch for hour/minute repeater support
Date: Wed, 22 Sep 2010 03:06:59 -0400
Message-ID: <17665.1285139219@gamaville.dokosmarshall.org>
References: <24904.1284483999@iu.edu>
	<CAACDA2F-3A08-4A30-A6C5-42FE2F11AF1F@gmail.com>
	<AANLkTi=SoT7ycJk7ufQn2TnOh8kiZTtQ9jYmEXi5yVNi@mail.gmail.com>
Reply-To: nicholas.dokos@hp.com
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from [140.186.70.92] (port=44503 helo=eggs.gnu.org)
	by lists.gnu.org with esmtp (Exim 4.43) id 1OyJQI-0002ks-79
	for emacs-orgmode@gnu.org; Wed, 22 Sep 2010 03:07:23 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69)
	(envelope-from <nicholas.dokos@hp.com>) id 1OyJQ7-0005e5-2n
	for emacs-orgmode@gnu.org; Wed, 22 Sep 2010 03:07:20 -0400
Received: from vms173007pub.verizon.net ([206.46.173.7]:52238)
	by eggs.gnu.org with esmtp (Exim 4.69)
	(envelope-from <nicholas.dokos@hp.com>) id 1OyJQ6-0005dm-SP
	for emacs-orgmode@gnu.org; Wed, 22 Sep 2010 03:07:11 -0400
Received: from gamaville.dokosmarshall.org ([unknown] [173.76.32.106])
	by vms173007.mailsrvcs.net
	(Sun Java(tm) System Messaging Server 7u2-7.02 32bit (built Apr 16
	2009)) with ESMTPA id <0L9400AJWZRN0SQE@vms173007.mailsrvcs.net> for
	emacs-orgmode@gnu.org; Wed, 22 Sep 2010 02:06:59 -0500 (CDT)
In-reply-to: Message from Manish <mailtomanish.sharma@gmail.com> of
	"Wed, 22 Sep 2010 10:17:12 +0530."
	<AANLkTi=SoT7ycJk7ufQn2TnOh8kiZTtQ9jYmEXi5yVNi@mail.gmail.com>
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: Manish <mailtomanish.sharma@gmail.com>
Cc: "Andrew J. Korty" <ajk@iu.edu>, nicholas.dokos@hp.com, emacs-orgmode@gnu.org, Carsten Dominik <carsten.dominik@gmail.com>

Manish <mailtomanish.sharma@gmail.com> wrote:

> Hello Andrew,
> 
> I copied the diff from "---" to the version number at the end of the
> diff to a file and ran a "git apply <patch file>" while on a local
> branch. It fails with "fatal: corrupt patch at line 12" which is:
> 
> ,----
> | @cindex timestamp, with repeater interval
> `----
> 
> Any clues what I could be doing wrong?
> 

Don't edit the message file: ``git apply'' and ``git am'' are perfectly
capable of stripping out the irrelevant stuf.

I did

   $ git checkout -b foo master

to create a ``foo'' branch and then

   $ git am  ~/Mail/org/25794
   Applying: Apply patch for hour/minute repeater support

(that's the file that contains Andrew's mail message - no editing involved).
As you can see, it worked without a hitch.

HTH,
Nick