~alpine/devel

2 2

[alpine-devel] testing/luasec: new apkbuild

Details
Message ID
<20090610152355.A6FF237E4A@smtp4-1-sn2.hy.skanova.net>
Sender timestamp
1244647434
DKIM signature
missing
Download raw message
Please review and apply.
luasec is used by prosody.

<<mhavela>>
Michael Mason <ms13sp@gmail.com>
Details
Message ID
<E7B038C3-EFFB-4FF2-90F5-F47CA3369529@gmail.com>
In-Reply-To
<20090610152355.A6FF237E4A@smtp4-1-sn2.hy.skanova.net> (view parent)
Sender timestamp
1244675765
DKIM signature
missing
Download raw message
On Jun 10, 2009, at 3:23 PM, Mika Havela wrote:

> Please review and apply.
> luasec is used by prosody.
>
> <<mhavela>>
>
Applied Patch.
Added openssl-dev to make depends and the build worked.

> <0001-testing-luasec-new-apkbuild.patch>



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Details
Message ID
<1244705010.5347.19.camel@localhost.localdomain>
In-Reply-To
<E7B038C3-EFFB-4FF2-90F5-F47CA3369529@gmail.com> (view parent)
Sender timestamp
1244705010
DKIM signature
missing
Download raw message
On Wed, 2009-06-10 at 23:16 +0000, Michael Mason wrote:
> On Jun 10, 2009, at 3:23 PM, Mika Havela wrote:
> 
> > Please review and apply.
> > luasec is used by prosody.
> >
> > <<mhavela>>
> >
> Applied Patch.
> Added openssl-dev to make depends and the build worked.

Michael,

Thanks alot for merging those patches. Makes life alot easier for me.

A tip though... Please use 'git am' to import patches. Then will Mika
Havela show up as author rather than you. If you have a fix for the
patch then you make a new commit.

Also, when you are the author, the commit will get a different commit id
and when Mika pulls your tree (or from main aports tre after I have
merged it) git will see this commit as a different commit which
conflicts with his own and he have to deal with a conflict.

If you use git-am, the commit id will remain, and Mika's git will figure
out that its the same commit and he will only merge your final changes
(separate commits) on top of his own and he does not have to deal with
any conflict.

http://www.kernel.org/pub/software/scm/git/docs/git-am.html


Thanks!

-nc



---
Unsubscribe:  alpine-devel+unsubscribe@lists.alpinelinux.org
Help:         alpine-devel+help@lists.alpinelinux.org
---
Reply to thread Export thread (mbox)