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: Re: fixing an Elpa package Date: Thu, 23 Apr 2015 17:20:17 +0800 Message-ID: <87sibrcib2.fsf@ericabrahamsen.net> References: <87a8y5ih6c.fsf@ericabrahamsen.net> <87wq18hji4.fsf@ericabrahamsen.net> <87383vgzk7.fsf@ericabrahamsen.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1429780875 22876 80.91.229.3 (23 Apr 2015 09:21:15 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 23 Apr 2015 09:21:15 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Thu Apr 23 11:21:07 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 1YlDJV-0006FJ-Qm for ged-emacs-devel@m.gmane.org; Thu, 23 Apr 2015 11:20:53 +0200 Original-Received: from localhost ([::1]:39067 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlDJV-0002LY-5D for ged-emacs-devel@m.gmane.org; Thu, 23 Apr 2015 05:20:53 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:56703) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlDJQ-0002J6-5z for emacs-devel@gnu.org; Thu, 23 Apr 2015 05:20:49 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YlDJM-0004QC-W3 for emacs-devel@gnu.org; Thu, 23 Apr 2015 05:20:48 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:53945) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YlDJM-0004Pb-7V for emacs-devel@gnu.org; Thu, 23 Apr 2015 05:20:44 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1YlDJI-00065J-9K for emacs-devel@gnu.org; Thu, 23 Apr 2015 11:20:41 +0200 Original-Received: from 123.123.16.93 ([123.123.16.93]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 23 Apr 2015 11:20:40 +0200 Original-Received: from eric by 123.123.16.93 with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Thu, 23 Apr 2015 11:20:40 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 56 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 123.123.16.93 User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:hLnfrVdrxI1EIV4kx4XnJwuDT0w= 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:185794 Archived-At: Stefan Monnier writes: >> Okay, thanks for this. Just so I'm very clear: the above command uses >> --squash so that Git would pay attention to the metadata in your dummy >> commit, but I should not be using --squash from here on out, is that >> correct? > > I'm not sure, to tell you the truth. I never use --squash, so I'm not > very familiar with it. But with the current tree, I see that > > git subtree merge --squash -P packages/gnorb gnorb/master > > gives me relatively few conflicts, whereas > > git subtree merge -P packages/gnorb gnorb/master > > gives me a load of conflicts, so it seems that if you don't provide the > "--squash" argument, Git assumes that you haven't used "--squash" in the > past either and doesn't look for the commit messages that "--squash" > uses to try and find the common ancestor. > > IOW, if you've used --squash in the past, it's best to keep doing so. > > You can switch to the non-squash option, of course, if you want. > Basically, you can do a > > git subtree merge -P packages/gnorb 321b23b1ad1b770e2b2bd27921f069b9394ca4d0 > git diff | patch -R -p1 > git commit -am 'Dummy merge to convert to non-squash subtree' > > where 321b23b1ad1b770e2b2bd27921f069b9394ca4d0 is the revision > up-to-which the branch has already been (squash-)merged. > >> I ran the command you listed above, resolved the conflicts, and >> committed. That gave me one squashed commit containing all the new >> commits from my external repo, and another merge commit (this second >> commit was huge, and looked like most of the code from the package). > > Sounds right. > >> The external and Elpa trees were not in sync, though -- "diff -r" gave >> me some differences. > > These should only be differences due to the commits I installed directly > into elpa.git, which you maybe haven't merged in the same way into your tree? > [ Just guessing here. ] Okay, I stuck with squashing since switching to unsquashing looked like it was going to get ugly. I just pushed, and hopefully will not break anything. There's still a one-line cosmetic difference in gnorb-org.el between Elpa and the external repo, but I'm going to close one eye and pretend I don't see it. Thanks a lot for your help, Eric