From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.help Subject: Re: Elpa packages and Makefiles Date: Wed, 08 Oct 2014 14:31:21 -0400 Message-ID: References: <877g3j8dg9.fsf@ericabrahamsen.net> <87oatwrtew.fsf@ericabrahamsen.net> <87oatnxmm0.fsf@ericabrahamsen.net> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1412793130 23280 80.91.229.3 (8 Oct 2014 18:32:10 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Wed, 8 Oct 2014 18:32:10 +0000 (UTC) To: help-gnu-emacs@gnu.org Original-X-From: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Wed Oct 08 20:32:03 2014 Return-path: Envelope-to: geh-help-gnu-emacs@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 1Xbw1r-0000ZQ-3X for geh-help-gnu-emacs@m.gmane.org; Wed, 08 Oct 2014 20:32:03 +0200 Original-Received: from localhost ([::1]:37817 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xbw1q-0007nP-NS for geh-help-gnu-emacs@m.gmane.org; Wed, 08 Oct 2014 14:32:02 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:36975) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xbw1Z-0007nD-AX for help-gnu-emacs@gnu.org; Wed, 08 Oct 2014 14:31:53 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Xbw1R-0004TO-Re for help-gnu-emacs@gnu.org; Wed, 08 Oct 2014 14:31:45 -0400 Original-Received: from plane.gmane.org ([80.91.229.3]:57384) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Xbw1R-0004T9-LM for help-gnu-emacs@gnu.org; Wed, 08 Oct 2014 14:31:37 -0400 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1Xbw1N-0000Hi-Gp for help-gnu-emacs@gnu.org; Wed, 08 Oct 2014 20:31:33 +0200 Original-Received: from 69-196-168-232.dsl.teksavvy.com ([69.196.168.232]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 08 Oct 2014 20:31:33 +0200 Original-Received: from monnier by 69-196-168-232.dsl.teksavvy.com with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Wed, 08 Oct 2014 20:31:33 +0200 X-Injected-Via-Gmane: http://gmane.org/ Original-Lines: 26 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: 69-196-168-232.dsl.teksavvy.com User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.4.50 (gnu/linux) Cancel-Lock: sha1:Nw1DVE+Re4XHd47Egc0/421aTr0= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: help-gnu-emacs@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: Users list for the GNU Emacs text editor List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Original-Sender: help-gnu-emacs-bounces+geh-help-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.help:100343 Archived-At: > If I specify an Elpa package as a :subtree, is this a subtree in the > sense of the actual "git subtree" command, or is this just a subtree > merge? :subtree means that the package is kept in the "master" branch of elpa.git, in a subdirectory of `packages'. And if there is a need to merge from some external VCS, then the merge is typically done by a "subtree merge". > git subtree add --prefix packages/gnorb gnorb-remote master --squash > or this: > git checkout -b gnorb-branch gnorb-remote/master > git read-tree --prefix=packages/gnorb -u gnorb-branch I'm sorry, but I don't spend enough time with Git to know the difference between these. The way I do it, usually is by "git merge" which sometimes doesn't put things at the right place (when it's the initial importation of the package), so I then clean things up by hand. The reason I prefer doing that is because I think I know what "git merge" does, whereas I have difficulty understanding what "git read-tree" or "git subtree" does. Stefan