From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.devel Subject: Re: Tramp as ELPA package Date: Mon, 20 May 2019 15:05:04 +0200 Message-ID: <87blzxcm4f.fsf@gmx.de> References: <20180819204918.GA3934@ACM> <20180821162043.GA3946@ACM> <20180823213418.GA32596@ACM> <83lg8w9mt2.fsf@gnu.org> <871saoc70o.fsf@gmx.de> <87wosebzur.fsf_-_@gmx.de> <87tvnh9yg6.fsf@gmx.de> <8736myq6wo.fsf@gmx.de> <874l7cpl66.fsf@gmx.de> <87y34k7jww.fsf@gmx.de> Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="19114"; mail-complaints-to="usenet@blaine.gmane.org" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/27.0.50 (gnu/linux) Cc: Eli Zaretskii , emacs-devel@gnu.org To: Stefan Monnier Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon May 20 15:06:15 2019 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([209.51.188.17]) by blaine.gmane.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1hShza-0004fK-IN for ged-emacs-devel@m.gmane.org; Mon, 20 May 2019 15:06:14 +0200 Original-Received: from localhost ([127.0.0.1]:35435 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hShzZ-00080Q-HY for ged-emacs-devel@m.gmane.org; Mon, 20 May 2019 09:06:13 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:48675) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hShys-0007WM-EX for emacs-devel@gnu.org; Mon, 20 May 2019 09:05:33 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hShyq-0006kq-D5 for emacs-devel@gnu.org; Mon, 20 May 2019 09:05:30 -0400 Original-Received: from mout.gmx.net ([212.227.17.21]:57073) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hShyk-0006da-Mq; Mon, 20 May 2019 09:05:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net; s=badeba3b8450; t=1558357507; bh=jNNUcF8UY6AqWUEjCAIjJVQBJdEeSDfFe5duaaEeSBQ=; h=X-UI-Sender-Class:From:To:Cc:Subject:References:Date:In-Reply-To; b=eRKjOnI/trkGH2pvMwIuJlM1mEwzYQyNIuxxQyY7SmQeQ258gVFn5b98vXB8Xn0m0 YCnLMv3Q7o5fRDu3r6BdKUsXzL8Ga96MMR9clhxmM2IsNOrnGZDZKAlxrIopsDncfw aQWaPex+N8ZMCY2i9QsuMP2PuwpugaGb662W7r+Q= X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Original-Received: from detlef.gmx.de ([212.86.60.145]) by mail.gmx.com (mrgmx101 [212.227.17.168]) with ESMTPSA (Nemesis) id 0LzoSt-1gX9Q80eYN-0150Ui; Mon, 20 May 2019 15:05:07 +0200 In-Reply-To: (Stefan Monnier's message of "Mon, 08 Apr 2019 09:07:02 -0400") X-Provags-ID: V03:K1:vCTnNUokQdc69cidyYvI4AU0tOc4HiGDxog7jpb2kgvpVRirDgx TpXYadlZHdpVQDbfjBdQwVIKImSA1K+KTtUsNAmlQhrsMBcivt+sRLxL4mjr4jFmbtttY4i F4GxeUsU2cHNTrvnoIuDvC/VLUdCtVVZoWqJVt8XpjqROa/9rDuZHzIX0PbeJ7zzYFy8Cf2 LXNG4lZpa5OZaqiWzXcCw== X-UI-Out-Filterresults: notjunk:1;V03:K0:H+lGSI0qV4M=:bIZQQK8a3bXXuYAYSoC2tC wnTAWh7PkH9SruM9KrOsj1dOtHXimPA97Ag/LnL/KZIR6CTsCOxdVUFleVG320D0FsKmrFTzV OF4YCkbn+EiJgCKSXO0lyq9uLNvH9saU+C7xjr4dAk3539ZtBJqJ2d7GEOQSPiNecpdYbEz0W PrLPd4yn5I9IKHFqVDZAlNS6ehDZRKssP3DSi1kE/uJqZ5kFG50DPQqiHjHLPoGIJFKJ4VCR0 fPuOHBIqgbYiYBIp6kE+5iUnrt9IHlohRRheunVfBWp5OQRLMfc7tFGunhUh8TDuLWeR/td1u JTqB3lIBpiULpbty69/zBeduuSm49d8H9UpZXK1PcV6x9Q41b4FyCav52oP1L65nL6dU4JlbK UJDJ+BfPcmuT/DExT7RBAEgiu2+g0U/oGqRbqdpK8ZohzitC16RSfy1FkC7eBn5ARl3lwKmRV W6Q11Lst7dHum5sXLROQ9dIExFSJzyUfV4cMTRWNa9sbsKuBgbangSqe9sEZKg33EY/9rG3v4 uy85dG8mFOyBNVg7A1gMl/0HlNRyINq2hDl3VZHzxpZUpBOpBOEjZc3QAzMIRQPf9j57q5jQ1 KRoMF5fwgD1hP37sXfw/kNuhFm+ZYgs+QA+uTqXwu3Ue0rEa+areiWxPpg/cITOZCGFBf3MNp S8mU2Kjp5xZBeliTHYY27QYG3gSuxTutKvm1KJJZFSJluv2OwQnYcB8pBlL7QTjb8qg1otNPV s8OAsqxL1/qrxjf7Og203nQZW8vZSxp9BInyuISr7IS+h408yAU7AW9hGee4pRF+XMmZC0b0 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.21 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:236789 Archived-At: Stefan Monnier writes: Hi Stefan, >>> Why can't you take that package archive's content, put it in a Git >>> branch and push that to elpa.git? >> >> I've tried it. I've created a branch 'elpa' in the Tramp repository, an= d >> in this branch I've moved lisp/*.el to the root of the repository (via >> git mv). Committed this change. Then I've changed something in tramp.el= , >> and tried to merge the master and elpa branches. The repository layout >> (i.e., where the *.el files are located) is merged as well. Not what I = want. > > Indeed, despite Git proponent's optimism, Git doesn't deal very well > with files that have moved, so you can't "git merge" into that > "archive-only" branch. Instead you need to treat it like a "tarball", > not a branch. I.e. instead of > > git merge master > > you want to use something like: > > cp ../master/lisp/*.el ./ > make > git commit > > Of course, I'd prefer we fix the elpa.gnu.org scripts so they can run > the "make" themselves, which would solve this problem more cleanly. Well, in order to make progress, I've created an orphaned branch in the Tramp repository, as suggested by Glenn. It counts Tramp in version 0, that we can still test. Could you, pls, add this as external branch to elpa? The URL is ("tramp" :external "https://git.savannah.gnu.org/cgit/tramp.git/?h=3Dtra= mp-elpa") I hope to release this via ELPA in parallel to the next Tramp 2.4.2 release, which is planned roughly at the end of June. >> And as I said already, a manual merge (diffing all *.el files, and >> applying the changes) is not an option for me, because I must sync thre= e >> different repositories manually then. > > I had no intention to suggest manual merges, indeed. I hope a script will do. > Stefan Best regards, Michael.