X-Original-To: alpine-devel@lists.alpinelinux.org
Delivered-To: alpine-devel@lists.alpinelinux.org
Received: from mail-fx0-f228.google.com (mail-fx0-f228.google.com [209.85.220.228])
	by lists.alpinelinux.org (Postfix) with ESMTP id 2E7671EC814
	for <alpine-devel@lists.alpinelinux.org>; Thu, 11 Jun 2009 07:23:55 +0000 (UTC)
Received: by fxm28 with SMTP id 28so1379477fxm.25
        for <alpine-devel@lists.alpinelinux.org>; Thu, 11 Jun 2009 00:23:54 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        h=domainkey-signature:received:received:subject:from:to:cc
         :in-reply-to:references:content-type:date:message-id:mime-version
         :x-mailer:content-transfer-encoding;
        bh=HuXa4ZCbA3LlP5omN1AnUL+GF2BKe9igB6c9xthQlHc=;
        b=Am9C2qK1A3bnH7rqR4sC8of0eBdQwg3kWS3XkoBrGB7L3wlqaQRAIQ/cAL35mtCWiq
         t2TUCxeKrjSJpcNc+e9ie2fsTeWUKf9JCrG4EebhMpSWWYdM6Toi8CjUuHgvCjXx1xKL
         MSVUTrRS9+BH+df0Ik4OAqW3Z35LBTWzlPyiI=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=subject:from:to:cc:in-reply-to:references:content-type:date
         :message-id:mime-version:x-mailer:content-transfer-encoding;
        b=U/f1xML6pEvPS3/xGsOYSF5wHbpj+GUc1lFTVu41kvrUz3miRC2G7SSP3W0w0KypF8
         nNBF+ApY1mGGZWZMmMrSkeWkBC8JzbudA/5ttSEASzrYHSzxzPHk/eWjn6mu0oTj6BKC
         c1aJblunJvmc1zZ637ysVJpJ87T4AhRegLd7s=
Received: by 10.103.214.13 with SMTP id r13mr1150854muq.37.1244705034513;
        Thu, 11 Jun 2009 00:23:54 -0700 (PDT)
Received: from ?10.65.65.1? (ti211310a081-0504.bb.online.no [85.164.1.248])
        by mx.google.com with ESMTPS id u9sm349713muf.7.2009.06.11.00.23.52
        (version=SSLv3 cipher=RC4-MD5);
        Thu, 11 Jun 2009 00:23:53 -0700 (PDT)
Subject: Re: [alpine-devel] testing/luasec: new apkbuild
From: Natanael Copa <natanael.copa@gmail.com>
To: Michael Mason <ms13sp@gmail.com>
Cc: Mika Havela <mika.havela@gmail.com>, alpine <alpine-devel@lists.alpinelinux.org>
In-Reply-To: <E7B038C3-EFFB-4FF2-90F5-F47CA3369529@gmail.com>
References: <20090610152355.A6FF237E4A@smtp4-1-sn2.hy.skanova.net>
	 <E7B038C3-EFFB-4FF2-90F5-F47CA3369529@gmail.com>
Content-Type: text/plain
Date: Thu, 11 Jun 2009 09:23:30 +0200
Message-Id: <1244705010.5347.19.camel@localhost.localdomain>
X-Mailinglist: alpine-devel
Precedence: list
List-Id: Alpine Development <alpine-devel.lists.alpinelinux.org>
List-Unsubscribe: 
	<mailto:alpine-devel+unsubscribe@lists.alpinelinux.org?subject=unsubscribe>
List-Post: <mailto:alpine-devel@lists.alpinelinux.org>
List-Help: <mailto:alpine-devel+help@lists.alpinelinux.org?subject=help>
List-Subscribe: 
	<mailto:alpine-devel+subscribe@lists.alpinelinux.org?subject=subscribe>
Mime-Version: 1.0
X-Mailer: Evolution 2.26.2 
Content-Transfer-Encoding: 7bit

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
---