From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= Newsgroups: gmane.emacs.devel Subject: How do I import upstream commits into ELPA Date: Sat, 22 Oct 2016 11:26:58 -0400 Message-ID: <563f19bf-aee9-bef8-6a11-befbf1fe14ed@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="Xf3EuvDowE10QBhmPHTfcMkKiSMNoA2n4" X-Trace: blaine.gmane.org 1477150050 21242 195.159.176.226 (22 Oct 2016 15:27:30 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 22 Oct 2016 15:27:30 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:45.0) Gecko/20100101 Thunderbird/45.3.0 To: Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 22 17:27:26 2016 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1bxyCW-0003Sk-6f for ged-emacs-devel@m.gmane.org; Sat, 22 Oct 2016 17:27:12 +0200 Original-Received: from localhost ([::1]:37713 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxyCY-0002eF-Hp for ged-emacs-devel@m.gmane.org; Sat, 22 Oct 2016 11:27:14 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:40674) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bxyCR-0002dy-UM for emacs-devel@gnu.org; Sat, 22 Oct 2016 11:27:09 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bxyCO-0005rD-QU for emacs-devel@gnu.org; Sat, 22 Oct 2016 11:27:07 -0400 Original-Received: from mout.kundenserver.de ([212.227.17.24]:61763) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1bxyCO-0005qw-Gr for emacs-devel@gnu.org; Sat, 22 Oct 2016 11:27:04 -0400 Original-Received: from [192.168.1.109] ([67.186.135.89]) by mrelayeu.kundenserver.de (mreue104) with ESMTPSA (Nemesis) id 0LxOmo-1czD4x2vPO-016wOb for ; Sat, 22 Oct 2016 17:27:03 +0200 X-Provags-ID: V03:K0:f6IxysWjtBuZoxUGlfZCXCOZshCF0iNGqUa1eNsO0ILFiIgFYCj K9C8wgfqkEqw06utgJ/wPz6UIrVVLrnt32eJb7YzxLiQDcG3j+kZY61r5fET3ezp2/GlPf3 epQO9c8WyuwWU16npcmRQkAiVttnk7F5HM/xKwutCi4JHUy+T/oB7NZ4vLxvRGmVo1epfvS r/ML/jeDWfT1ZWIlclDeg== X-UI-Out-Filterresults: notjunk:1;V01:K0:WRtHEeOs37I=:4dgp9aImAvuKX9DcOh9mVy iBgtgQjB0OAYQkV5Dz2K8xkgNpsOwfoBsl5KM+fqFeGx0nI/jTJdCiY8kdEymBDd/7wYuS4hd 2EPWOlIrZ4igEJHo4XXsE5833y56NEwHdmrSHIQaxhPIpczrrlxBAFe2kewUzkwkOQ/J+vJVv BDYX9x0Gj9n5S7BmuzNa6pvHJrQ0SYI6tunhmXTDsEgQu5dIvwn56BhPLVQfxzIASZrh1zpju kXUZ2UKDcXr6pcUXASpGxYTugKJeaQcyPvfCQ1rc2yV+VRx0QZ5IdMcy6WcV3BF1uJVPdZxKU FCMocEmCd3aOhofSj0o2M1u5rrtXXT5uzvK+CMn83c8xtljzlpWY+kH/lQ75rItFik/gti2Mf 2p+0ggKRImG/aQUk8OUqOUL1ddMZ/PyzR8O577lqOsggR9nwpCK4uQDGMeMQnQR0qYhglcC5b k5ckm3tf6nIbrmyPkIRxRKOAqL8/DJPht53cdUUd9bZ7quI5NMegFbTsNqzmcmPtUX9N1azjb Gpu/YJV8Al1V8SZhMBtEqaKCovPGmu7Jx72jyFJzuoHUlZIeHwRK6sic3Jtukg8cH/qmV1OYW lHpf4TJ0vaROL+S0EFbCAc4lRwhpWqa0xI5dZY6z9U8YISejxmNkCp844G+3xjDk16hZWOliF 7tTOOa2vYcqCoEz4Y3MOgGAqOlZ7hyyl0hfajAKNrS0ai3xi03+EcAejv4ryCPmUfrWQ= X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: "Emacs-devel" Xref: news.gmane.org gmane.emacs.devel:208598 Archived-At: This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --Xf3EuvDowE10QBhmPHTfcMkKiSMNoA2n4 Content-Type: multipart/mixed; boundary="akW41eCMI4eBsldRiBUwv4W9eHDI614Pr"; protected-headers="v1" From: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= To: Emacs developers Message-ID: <563f19bf-aee9-bef8-6a11-befbf1fe14ed@gmail.com> Subject: How do I import upstream commits into ELPA --akW41eCMI4eBsldRiBUwv4W9eHDI614Pr Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Hi all, A few months ago Stefan pushed a small fix to my compact-docstrings packa= ge. I wanted to upstream it to the GitHub repository today, so I ran the= following: git remote add github-compact-docstrings cpitclaudel/compact-docstrings= git subtree push --prefix=3Dpackages/compact-docstrings/ https://github= =2Ecom/cpitclaudel/compact-docstrings.git master This seems to have worked nicely. However, I then added an extra commit = to the Github repository, and I'd like to pull it into ELPA. Running git subtree pull --prefix=3Dpackages/compact-docstrings/ github-compact= -docstrings master Gives me the following, which also seems fine: From github.com:cpitclaudel/compact-docstrings * branch master -> FETCH_HEAD Auto-merging packages/compact-docstrings/compact-docstrings.el Merge made by the 'recursive' strategy. packages/compact-docstrings/compact-docstrings.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) However, when I look at the history that it created, I get three commits = instead of 2: Stefan's change, re-pulled from the GitHub repository; my n= ew change; and a merge commit. Is that expected? If not, how can I not re-merge Stefan's change? Thanks! Cl=C3=A9ment. --akW41eCMI4eBsldRiBUwv4W9eHDI614Pr-- --Xf3EuvDowE10QBhmPHTfcMkKiSMNoA2n4 Content-Type: application/pgp-signature; name="signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="signature.asc" -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQIcBAEBCAAGBQJYC4VCAAoJEPqg+cTm90wjSCQP/iUFbDKr4dPPC39wHVW1w1RQ gCfGx5TbObRfCUzyAlPhMv/FhhYkBHr6rDlcKEkRDE08a1Ooxp79cORAZvk4rW8r p1S54vLz89cErONkLMu/EqMIIRJLxd26H7P0MVy06yZFAeOQiUO4nc3I5HFz9hYN mvKoH05s16b8B7keAYiDT1lN+MRtZGur4waLcjScszcIzfuU/nf0PB9uo9mtY9cK VKi+LO1sBxv33xjm4t35oldWclxTz2Ec+gfQJzvLvA8pnUZ1gXWkYpWL2kVRMIVg EmLcJbFaLrJA0i7P2pGAwRz6PK1n9dWWDgk+yizAg16XroKiEbkN/iOrL5iPUn7S 0hAkdUhXDYupIeLboJGFQbire9v+1QH1T7iwwudzBz1NCzahOHZe3+Wgz9Tffq/y fceQirs6UjS7LA2e847YNe6SUc8HQZsx1kjrYbtmDajQrpbM+V5NMhbAlXOID7zL gNzN0nZLHpNJ2HBkFHYkHJFDoHUllqV917L+nGCSX5rS0Z7BxNLF+Bp4PqV0eu62 1CPw6br8k51dBjhLduZyMjCcTaTP+hr2Zs2IiAGL1rota7nXBKR8AZ1WcHigTzkt O30Fuyh0pTCMLkobaFtfA3/ZtZK4czVA//njk26cQh6Swkb+t3IbWsw3GljToalO XnSsWxLiBJfIdlx3VvKQ =ZQTm -----END PGP SIGNATURE----- --Xf3EuvDowE10QBhmPHTfcMkKiSMNoA2n4--