From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ricardo Wurmus <rekado@elephly.net>
Subject: Re: no patch applies
Date: Fri, 05 Aug 2016 12:09:23 +0200
Message-ID: <87twezh6i4.fsf@elephly.net>
References: <CAJ98PDzFXqUhrpi_esztmAVer9BTnyCyLLM5Ykk+-rpX+Y8eHA@mail.gmail.com>
	<20160805034531.GA6229@jasmine>
	<CAEwRq=oupkTH9MFXO=PG+uquxAiT7k93MPLfhOU-MVt5pcee0w@mail.gmail.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
Return-path: <help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:60949)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1bVc4N-0005At-Cs
	for help-guix@gnu.org; Fri, 05 Aug 2016 06:09:36 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1bVc4K-0004mv-2V
	for help-guix@gnu.org; Fri, 05 Aug 2016 06:09:35 -0400
Received: from sender163-mail.zoho.com ([74.201.84.163]:24295)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <rekado@elephly.net>) id 1bVc4J-0004mb-QE
	for help-guix@gnu.org; Fri, 05 Aug 2016 06:09:31 -0400
In-reply-to: <CAEwRq=oupkTH9MFXO=PG+uquxAiT7k93MPLfhOU-MVt5pcee0w@mail.gmail.com>
List-Id: <help-guix.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/help-guix>,
	<mailto:help-guix-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/help-guix/>
List-Post: <mailto:help-guix@gnu.org>
List-Help: <mailto:help-guix-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/help-guix>,
	<mailto:help-guix-request@gnu.org?subject=subscribe>
Errors-To: help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org
Sender: "Help-Guix" <help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org>
To: Vincent Legoll <vincent.legoll@gmail.com>
Cc: help-guix <help-guix@gnu.org>


Vincent Legoll <vincent.legoll@gmail.com> writes:

> Hello
>
>>> I attempted to apply the patch onto a fresh Guix master and the patch does
>>> not apply, I don't know why
>
> When I fail to apply a patch that's often because of a wrong -p parameter.
> Try with "--dry-run -p0" or "--dry-run -p1" to find the good one. You can also
> look at file paths in the patch and deduce the right path strip level.

I haven’t used “patch” in quite a while because usually “git am
the-patch-file” just works.  If the patch was created with “git
format-patch” against master you shouldn’t have any problems using “git
am” on it.

~~ Ricardo