From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: fixing an Elpa package Date: Sun, 19 Apr 2015 21:52:13 -0400 Message-ID: References: <87a8y5ih6c.fsf@ericabrahamsen.net> <87wq18hji4.fsf@ericabrahamsen.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1429494754 4205 80.91.229.3 (20 Apr 2015 01:52:34 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Mon, 20 Apr 2015 01:52:34 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eric Abrahamsen Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Mon Apr 20 03:52:26 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 1Yk0sr-0001es-SB for ged-emacs-devel@m.gmane.org; Mon, 20 Apr 2015 03:52:26 +0200 Original-Received: from localhost ([::1]:51550 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk0sr-0003Vz-AN for ged-emacs-devel@m.gmane.org; Sun, 19 Apr 2015 21:52:25 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:46233) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk0so-0003Vg-8m for emacs-devel@gnu.org; Sun, 19 Apr 2015 21:52:23 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Yk0sk-0000QK-3k for emacs-devel@gnu.org; Sun, 19 Apr 2015 21:52:22 -0400 Original-Received: from chene.dit.umontreal.ca ([132.204.246.20]:54350) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Yk0sj-0000QA-TW for emacs-devel@gnu.org; Sun, 19 Apr 2015 21:52:18 -0400 Original-Received: from pastel.home (lechon.iro.umontreal.ca [132.204.27.242]) by chene.dit.umontreal.ca (8.14.1/8.14.1) with ESMTP id t3K1qDu2008769; Sun, 19 Apr 2015 21:52:14 -0400 Original-Received: by pastel.home (Postfix, from userid 20848) id 84D17282C; Sun, 19 Apr 2015 21:52:13 -0400 (EDT) In-Reply-To: <87wq18hji4.fsf@ericabrahamsen.net> (Eric Abrahamsen's message of "Sun, 19 Apr 2015 11:41:55 +0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.0.50 (gnu/linux) X-NAI-Spam-Flag: NO X-NAI-Spam-Threshold: 5 X-NAI-Spam-Score: 0 X-NAI-Spam-Rules: 1 Rules triggered RV5281=0 X-NAI-Spam-Version: 2.3.0.9393 : core <5281> : inlines <2753> : streams <1425359> : uri <1910926> 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.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:185684 Archived-At: >>> I guess that makes sense from Git's point of view, >> If the hashes are the same, then I don't see why it makes sense. > About 275 commits from the external repo went into Elpa as a single > squashed commit, ab3b913. The file contents are the same, but I assumed > Git saw no correspondence between the one squashed and many un-squashed > commits, and told me I was starting over. I think the situation is not quite like you say. I tried git subtree merge --squash -P packages/gnorb gnorb/master and it did not try to re-add everything. It did try to add too much ("git diff | wc" is a whole 80KB), because in % git log packages/gnorb/ [...] commit ce7004456df8d17d1b1bb9b1feab3ddafb1e078a Author: Eric Abrahamsen Date: Sat Oct 25 08:19:41 2014 -0700 Merging Gnorb commits up to 1.0.1 you somehow managed to "merge" without keeping track of the metadata ("git subtree merge --squash" doesn't keep all commits, but it does keep the hashes in the commit messages, so "git merge" doesn't understand what's going on, but "git subtree merge --squash" normally does, although in the above commit there's no such tracking, so maybe you didn't use "git subtree merge --squash"). > What's the next step? Commit a removal of the whole subtree, and start > over? I installed a dummy commit which merges the tree to which you apparently sync'd in the above commit, so the above git subtree merge --squash -P packages/gnorb gnorb/master now results in much fewer conflicts ("git diff | wc" is a mere 5KB). So now you just have to use the above command (or another one if you want to merge another revision than "gnorb/master"), then resolve the conflicts, then commit and push. If you need more help, you know where to find me ;-) > Semi-related question: if a users reports an emacs bug with my package > in the package header, or it gets tagged later, will an email be > automatically sent to me as maintainer? No, we currently don't have such a mechanism in place, sadly. Stefan