Mail archive
alpine-devel

Re: [alpine-devel] [PATCH] Move motif to main

From: Natanael Copa <ncopa_at_alpinelinux.org>
Date: Tue, 11 Nov 2014 08:13:38 +0100

On Mon, 10 Nov 2014 07:20:07 -0800
Isaac Dunham <ibid.ag_at_gmail.com> wrote:

> On Mon, Nov 10, 2014 at 08:54:57AM +0100, Natanael Copa wrote:
> > On Sun, 9 Nov 2014 12:34:22 -0800
> > Isaac Dunham <ibid.ag_at_gmail.com> wrote:
> >
> > > In my testing, Motif seems to be working well.
> > > Is there any objection to moving it to main?
> > >
> > > The attached patch will move it to main and add myself as
> > > contributor/maintainer, since that was my intent when I submitted it.
> > >
> > > Thanks,
> > > Isaac Dunham
> >
> > I'd be happy to move it to main.
> >
> > I get this error though:
> >
> > error: patch failed: testing/motif/11-fix_underlinking.patch:1
> > error: testing/motif/11-fix_underlinking.patch: patch does not apply
> > Patch failed at 0001 main/motif: move from testing
> >
> >
> > -nc
>
> Looks like 11-fix_underlinking.patch in git has ^M (\r) at eol for the
> comment; probably getting mutilated on the way.
>
> I'm not sure how to avoid that, other than sending the patch compressed.
> And I don't know for sure if that's enough, but I'll try.
> (If you could run "dos2unix -u" on the file somewhere along the line,
> it would be nice...)

I don't know what happened but the .gz didnt apply either. Maybe the
patch was broken somehow?

This is how i solved/worked around it:

In claws mail, i did "show source" of your original email (with the
patch as attachment). Marked all (ctrl-a), copy (ctrl-c), in terminal i
ran 'git am', paste (ctrl-shift-v) and ctrl-d for EOF.

The funny thing is that this worked, except the commit message was your
email subject and body with the patch headers as a part of the body. So
I just 'git commit --amend' and used the commit message from patch
header.

I hope it is correct.

Thanks!
>
> Thanks,
> Isaac Dunham
>



---
Unsubscribe:  alpine-devel+unsubscribe_at_lists.alpinelinux.org
Help:         alpine-devel+help_at_lists.alpinelinux.org
---
Received on Tue Nov 11 2014 - 08:13:38 GMT