From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Dmitry Gutov Newsgroups: gmane.emacs.devel Subject: Re: How do I import upstream commits into ELPA Date: Sat, 22 Oct 2016 23:30:39 +0300 Message-ID: <4aa78390-1082-a104-249a-51db4ac6f7ef@yandex.ru> References: <563f19bf-aee9-bef8-6a11-befbf1fe14ed@gmail.com> NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 8bit X-Trace: blaine.gmane.org 1477168274 14560 195.159.176.226 (22 Oct 2016 20:31:14 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Sat, 22 Oct 2016 20:31:14 +0000 (UTC) User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:50.0) Gecko/20100101 Thunderbird/50.0 To: =?UTF-8?Q?Cl=c3=a9ment_Pit--Claudel?= , Emacs developers Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Oct 22 22:31:09 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 1by2wO-00019Y-6O for ged-emacs-devel@m.gmane.org; Sat, 22 Oct 2016 22:30:52 +0200 Original-Received: from localhost ([::1]:38599 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1by2wQ-0001Qh-GE for ged-emacs-devel@m.gmane.org; Sat, 22 Oct 2016 16:30:54 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:34149) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1by2wK-0001QR-7i for emacs-devel@gnu.org; Sat, 22 Oct 2016 16:30:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1by2wF-0006Om-Bg for emacs-devel@gnu.org; Sat, 22 Oct 2016 16:30:48 -0400 Original-Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:37350) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1by2wF-0006OY-4T for emacs-devel@gnu.org; Sat, 22 Oct 2016 16:30:43 -0400 Original-Received: by mail-wm0-x22e.google.com with SMTP id f193so45787320wmg.0 for ; Sat, 22 Oct 2016 13:30:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:subject:to:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=1hc+xKkclPuJzK4oQw6ArHJdgbdskm9f+0JH3hn/dJs=; b=JFm/fJ0EItaClas6e43iWgFC2GzaoR0IDhPcKZdDLsNIut0T6u60W1RrfNPgDlCf73 j4BlGfJMstXvGKb1Jrgz60irYANXJEMzW3H+WhXnOOgNIzMF5fJRwRLXawYE/Q3Bf5DG aVywK55YnNqaz+VD5byG8dM/G1fT2gpXMfmd6XS33GjNyLxvuCS6xOG+Uh3OZK1cooNq 3Xr9OZ/HEi6PKJKTQhgtMYqlKWCZsArdLTc+C3c/RjFqcthM5oKeBgDuDovcuRZPXwkT cOvloPmHJzaQdRKw4FZet8UkzMVyAVtQLS6n1KZey+SrptOVsJwatqxBgJtH3kZihWAo NuSg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:sender:subject:to:references:from:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=1hc+xKkclPuJzK4oQw6ArHJdgbdskm9f+0JH3hn/dJs=; b=I24JAkL+/E6fwwJClSdVFSc2bTCok4I2TKU+x9XorxS0LjjrIjY8X+qqbsiWiQywim EQPCy41MW9l1yRIfXOOGVTqqXyVREfKf1LpGyyyNEwwOaMQO8OZLL5SyDPKKn5SXOx+l HZSXMBwOvA8Vb4mbNzNpe6uN6e98yVLco80SWojS2ckRq91bOiGLlEfnb+4D/PJXKwVB 6UE8hhPc8NfC7bOEQ7ZmhucWz1GhDD8k1JAg3+6hvbppsI5TBUKDVeHPnDXU2QRFmv4D +uTs3tlWOjEyU6b50hHpC0rijrNmx6HEBU+sG2c84BkAMtkzg6dQ9owOh/mFJZ4wGkEL BqFQ== X-Gm-Message-State: AA6/9RmLgFyA8EgOFb+LCfSA4AQUJ89SJkn0MNuurTZEHJN2DSRVMLi+ao+IV9RhrTVFGg== X-Received: by 10.28.128.145 with SMTP id b139mr15955533wmd.76.1477168241688; Sat, 22 Oct 2016 13:30:41 -0700 (PDT) Original-Received: from [192.168.1.3] ([185.105.173.41]) by smtp.googlemail.com with ESMTPSA id uq6sm10019265wjc.37.2016.10.22.13.30.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Oct 2016 13:30:40 -0700 (PDT) In-Reply-To: <563f19bf-aee9-bef8-6a11-befbf1fe14ed@gmail.com> Content-Language: en-US X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 2a00:1450:400c:c09::22e 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:208605 Archived-At: On 22.10.2016 18:26, Clément Pit--Claudel wrote: > 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 new change; and a merge commit. > > Is that expected? Yes. That's how the subtree feature works, for better or worse.