From mboxrd@z Thu Jan  1 00:00:00 1970
From: Jan <tona_kosmicznego_smiecia@interia.pl>
Subject: Re: Packaging Jami "progress"
Date: Wed, 8 Apr 2020 01:52:14 +0200
Message-ID: <20200408015203.30acce08@kompiuter>
References: <20200406183556.560f8e62@kompiuter> <87o8s4o4gz.fsf@devup.no>
 <20200408005125.3a18c09b@kompiuter> <877dyqlwux.fsf@devup.no>
Mime-Version: 1.0
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: 7bit
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:40185)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <tona_kosmicznego_smiecia@interia.pl>)
 id 1jLy15-0004VQ-NF
 for guix-devel@gnu.org; Tue, 07 Apr 2020 19:52:28 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <tona_kosmicznego_smiecia@interia.pl>)
 id 1jLy14-0005fn-Lf
 for guix-devel@gnu.org; Tue, 07 Apr 2020 19:52:27 -0400
Received: from smtpo.poczta.interia.pl ([217.74.65.233]:41112)
 by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <tona_kosmicznego_smiecia@interia.pl>)
 id 1jLy14-0005en-31
 for guix-devel@gnu.org; Tue, 07 Apr 2020 19:52:26 -0400
In-Reply-To: <877dyqlwux.fsf@devup.no>
List-Id: "Development of GNU Guix and the GNU System distribution."
 <guix-devel.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=unsubscribe>
List-Archive: <https://lists.gnu.org/archive/html/guix-devel>
List-Post: <mailto:guix-devel@gnu.org>
List-Help: <mailto:guix-devel-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/guix-devel>,
 <mailto:guix-devel-request@gnu.org?subject=subscribe>
Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org
Sender: "Guix-devel"
 <guix-devel-bounces+gcggd-guix-devel=m.gmane-mx.org@gnu.org>
To: Marius Bakke <mbakke@fastmail.com>
Cc: guix-devel@gnu.org

On Wed, 08 Apr 2020 01:06:14 +0200
Marius Bakke <mbakke@fastmail.com> wrote:

> A git merge will merge all the commits, some of which are bound to
> cause conflicts.  I will try to resolve those tomorrow.
> 
> In the mean time, you should be able to "cherry-pick" your patches
> instead.  Something along the lines of:
> 
> $ git checkout core-updates
> $ git cherry-pick master..wip-jami
> 
> Does that work?

I'm currently hacking it together using "git format-patch" and "git
am" and it seems to work. I'll compile Jami and check if the bug is
present.
Will remember about this cherry-pick thing, because resolving failing
patches wasn't fun, thanks.

If it succeeds, I will need a way to copy contents of the store on my
powerful machine to my potato machine. Is "guix copy" the tool I can
use? 


Jan Wielkiewicz