From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Tramp as ELPA package Date: Mon, 08 Apr 2019 09:07:02 -0400 Message-ID: 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 Injection-Info: blaine.gmane.org; posting-host="blaine.gmane.org:195.159.176.226"; logging-data="203403"; 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: Michael Albinus Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 08 15:08:02 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 1hDU0G-000qmP-MV for ged-emacs-devel@m.gmane.org; Mon, 08 Apr 2019 15:08:00 +0200 Original-Received: from localhost ([127.0.0.1]:52884 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDU0F-0002d4-Ni for ged-emacs-devel@m.gmane.org; Mon, 08 Apr 2019 09:07:59 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:37207) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDTzT-0002bs-HY for emacs-devel@gnu.org; Mon, 08 Apr 2019 09:07:12 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hDTzR-0008Qh-Pi for emacs-devel@gnu.org; Mon, 08 Apr 2019 09:07:11 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:38538) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hDTzR-0008Oz-Db; Mon, 08 Apr 2019 09:07:09 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.7/8.14.1) with ESMTP id x38D72H5021756; Mon, 8 Apr 2019 09:07:02 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 5FD4967F53; Mon, 8 Apr 2019 09:07:02 -0400 (EDT) In-Reply-To: <87y34k7jww.fsf@gmx.de> (Michael Albinus's message of "Mon, 08 Apr 2019 14:37:03 +0200") X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 2 Rules triggered EDT_SA_DN_PASS=0, RV6520=0 X-NAI-Spam-Version: 2.3.0.9418 : core <6520> : inlines <7048> : streams <1818065> : uri <2828303> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 132.204.246.20 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:235112 Archived-At: >> 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, and > 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. > 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 three > different repositories manually then. I had no intention to suggest manual merges, indeed. Stefan