From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eric Abrahamsen Newsgroups: gmane.emacs.devel Subject: fixing an Elpa package Date: Sat, 18 Apr 2015 23:34:35 +0800 Message-ID: <87a8y5ih6c.fsf@ericabrahamsen.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1429371314 1625 80.91.229.3 (18 Apr 2015 15:35:14 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Sat, 18 Apr 2015 15:35:14 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat Apr 18 17:35:06 2015 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YjUlt-0005Bb-JN for ged-emacs-devel@m.gmane.org; Sat, 18 Apr 2015 17:35:05 +0200 Original-Received: from localhost ([::1]:45988 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjUls-0003v8-NA for ged-emacs-devel@m.gmane.org; Sat, 18 Apr 2015 11:35:04 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36766) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjUlo-0003uT-Cj for emacs-devel@gnu.org; Sat, 18 Apr 2015 11:35:01 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YjUlk-0005T4-8h for emacs-devel@gnu.org; Sat, 18 Apr 2015 11:35:00 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:39032) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YjUlk-0005Su-2p for emacs-devel@gnu.org; Sat, 18 Apr 2015 11:34:56 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YjUli-000542-0x for emacs-devel@gnu.org; Sat, 18 Apr 2015 17:34:54 +0200 Original-Received: from 222.129.224.131 ([222.129.224.131]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 18 Apr 2015 17:34:53 +0200 Original-Received: from eric by 222.129.224.131 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Sat, 18 Apr 2015 17:34:53 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 26 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 222.129.224.131 User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:l1oYZOuoCfur1+M1PKJCF2f42M8= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 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-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:185601 Archived-At: I've got a package (Gnorb) in Elpa that's stagnating because I can't update it using Git. I'm pretty close to bailing on this, but wanted to float a question first in case it's easier to resolve than I thought. I originally incorporated the package into Elpa as a subtree, squashed into one commit, from a repository elsewhere on my filesystem that is linked with Github. Since then there are now four commits to this subtree in Elpa, two of them squashes from the external repository. In the meantime, my old computer died and I got a new one. So I re-cloned both the Elpa repository and the Github-based repository onto the new machine. If I add my Github-based repository as a remote in the Elpa repository, then fetch and subtree-merge, Git tells me there are no common commits, and wants to merge in all (317) commits from the external repository. I guess that makes sense from Git's point of view, but I don't want to pollute Elpa with all those commits. I'm not sure it would even work, either. Granted, it was probably a bad idea to take the subtree approach to begin with. But there it is, and I've mostly lost patience with the whole thing. If there's any means of recovering from this -- even if it's a bit of a pain in the ass -- I would be very happy to do that, and I hope someone might be willing to share some recipes. Thanks, Eric