From mboxrd@z Thu Jan  1 00:00:00 1970
From: Pierre Neidhardt <mail@ambrevar.xyz>
Subject: Re: Packaging Jami progress
Date: Thu, 07 Nov 2019 21:37:52 +0100
Message-ID: <874kzfo21r.fsf@ambrevar.xyz>
References: <20191104214754.793ec2ff@interia.pl>
 <CAE4v=ph_rWQFY1c2kKfwYeQzxh44u6Ld1J=GVSVh1Jy+v4FccA@mail.gmail.com>
 <20191105175001.389c6117@interia.pl> <87pni5qouc.fsf@ambrevar.xyz>
 <20191106172445.3bdd057d@interia.pl> <87r22lorwh.fsf@ambrevar.xyz>
 <877e4bo646.fsf@ambrevar.xyz> <20191107204757.23dd08de@interia.pl>
Mime-Version: 1.0
Content-Type: multipart/signed; boundary="=-=-=";
 micalg=pgp-sha256; protocol="application/pgp-signature"
Return-path: <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:470:142:3::10]:43115)
 by lists.gnu.org with esmtp (Exim 4.90_1)
 (envelope-from <mail@ambrevar.xyz>) id 1iSoXV-0004WC-92
 for guix-devel@gnu.org; Thu, 07 Nov 2019 15:37:59 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
 (envelope-from <mail@ambrevar.xyz>) id 1iSoXT-0004bG-LE
 for guix-devel@gnu.org; Thu, 07 Nov 2019 15:37:56 -0500
Received: from relay5-d.mail.gandi.net ([217.70.183.197]:40601)
 by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32)
 (Exim 4.71) (envelope-from <mail@ambrevar.xyz>) id 1iSoXT-0004ah-FT
 for guix-devel@gnu.org; Thu, 07 Nov 2019 15:37:55 -0500
In-Reply-To: <20191107204757.23dd08de@interia.pl>
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.org@gnu.org
Sender: "Guix-devel" <guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org>
To: Jan Wielkiewicz <tona_kosmicznego_smiecia@interia.pl>
Cc: Guix-devel <guix-devel@gnu.org>

--=-=-=
Content-Type: text/plain
Content-Transfer-Encoding: quoted-printable

I think you produced the patchset against the wrong commit.
Try=20

  git format-patch origin

or

  git format-patch LAST-UPSTREAM-COMMIT

where you replace LAST-UPSTREAM-COMMIT as appropriate.

A pitfall is to write

  git format-patch YOUR-FIRST-COMMIT

then you'd omit your first commit, which is probably what happened.

> I also ran a strange command - "git cherrypick", when I was trying to
> figure out how to patch my commits.

Git cherrypick allows you to apply specific commits on top of the
current HEAD.

=2D-=20
Pierre Neidhardt
https://ambrevar.xyz/

--=-=-=
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEEUPM+LlsMPZAEJKvom9z0l6S7zH8FAl3EgKAACgkQm9z0l6S7
zH/uzQf+N0qC17Xn6XgYl7w6f81wjrecZfeTo9xB6m+ouKV3zGsiydS3p8zodp79
CH7D3AggwWVgwV96BoUq4fdf/zvS7Fa1E4qxZznjohjPA/+cPTtiOJtlyRiNeiK+
FNgYdjmhQo6NymDGEbOwqHEICbQ/1MZBSltsw+MBirFItlPGL7yJPwJWuMi/qYlq
bfqFFBmVkO4Fc0QBf4wBz0HRBTfGXIHuUXUN5DxzaefNkp1Cr3OMKzFjMWMaae7k
tFBnDaRq8GrfKj85lzixBPXDFbp4zVb/HjJWKch0GlAWLp3WT0XKoOEMg/9DdW5m
f1sqwMjcMpAQ5i9fzypqjzKng6iN6g==
=7grs
-----END PGP SIGNATURE-----
--=-=-=--