From mboxrd@z Thu Jan 1 00:00:00 1970 From: Catonano Subject: Re: no patch applies Date: Fri, 5 Aug 2016 15:07:19 +0200 Message-ID: References: <20160805034531.GA6229@jasmine> <87twezh6i4.fsf@elephly.net> Mime-Version: 1.0 Content-Type: multipart/alternative; boundary=001a114abe1e1cc5f5053952bf48 Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:37867) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVeqR-0000wb-2D for help-guix@gnu.org; Fri, 05 Aug 2016 09:07:23 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bVeqO-0003lp-OY for help-guix@gnu.org; Fri, 05 Aug 2016 09:07:22 -0400 Received: from mail-io0-x22b.google.com ([2607:f8b0:4001:c06::22b]:35633) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bVeqO-0003ll-Hu for help-guix@gnu.org; Fri, 05 Aug 2016 09:07:20 -0400 Received: by mail-io0-x22b.google.com with SMTP id m101so298886236ioi.2 for ; Fri, 05 Aug 2016 06:07:20 -0700 (PDT) In-Reply-To: <87twezh6i4.fsf@elephly.net> List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-guix-bounces+gcggh-help-guix=m.gmane.org@gnu.org Sender: "Help-Guix" To: Ricardo Wurmus , Leo Famulari Cc: help-guix --001a114abe1e1cc5f5053952bf48 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 2016-08-05 12:09 GMT+02:00 Ricardo Wurmus : > > Vincent Legoll 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=E2=80=99t used =E2=80=9Cpatch=E2=80=9D in quite a while because u= sually =E2=80=9Cgit am > the-patch-file=E2=80=9D just works. If the patch was created with =E2=80= =9Cgit > format-patch=E2=80=9D against master you shouldn=E2=80=99t have any probl= ems using =E2=80=9Cgit > am=E2=80=9D on it. > > ~~ Ricardo > > > Thank you all people for your help. I appreciate that. Yes, Ricardo, you nailed it I had attempted with git apply --check path/to/the.patch because I read that it is a good idea to verify the applicability of a patch before actually applying it Then I tried with a simple git am path/to/the.patch and it worked like a breeze I looked at the log and there's the commit of the patch on top of f467c3526= 1 I had wrongly assumed that "git apply --check.." and "git am..." would have envisioned the same process So what's the use case for "git apply --check.." ? Bah... Thanks again --001a114abe1e1cc5f5053952bf48 Content-Type: text/html; charset=UTF-8 Content-Transfer-Encoding: quoted-printable
2016-08-05 12:09 GMT+02:00 Ricardo Wurmus <rekado@elephl= y.net>:

Vincent Legoll <vincent.lego= ll@gmail.com> writes:

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

I haven=E2=80=99t used =E2=80=9Cpatch=E2=80=9D in quite a while beca= use usually =E2=80=9Cgit am
the-patch-file=E2=80=9D just works.=C2=A0 If the patch was created with =E2= =80=9Cgit
format-patch=E2=80=9D against master you shouldn=E2=80=99t have any problem= s using =E2=80=9Cgit
am=E2=80=9D on it.

~~ Ricardo



Thank you all people for= your help. I appreciate that.

Yes, Ricardo, y= ou nailed it

I had attempted with

=C2= =A0 git apply --check path/to/the.patch

because I read th= at it is a good idea to verify the applicability of a patch before actually= applying it

Then I tried with a simple

=C2=A0 git am path/to/the.patch

and it worked like a bre= eze

I looked at the log and there's the commit of the= patch on top of f467c35261

I had wrongly assumed that &q= uot;git apply --check.." and "git am..." would have envision= ed the same process
=C2=A0
So what's the u= se case for "git apply --check.." ? Bah...

Thanks again
--001a114abe1e1cc5f5053952bf48--