From: Ted Zlatanov <tzz@lifelogs.com>
To: help-gnu-emacs@gnu.org
Subject: Re: Elpa packages and Makefiles
Date: Thu, 09 Oct 2014 11:40:32 -0400 [thread overview]
Message-ID: <m2k349xndb.fsf@lifelogs.com> (raw)
In-Reply-To: mailman.10797.1412865640.1147.help-gnu-emacs@gnu.org
On Thu, 09 Oct 2014 10:40:09 -0400 Stefan Monnier <monnier@iro.umontreal.ca> wrote:
SM> The reason I prefer doing that is because I think I know what "git
SM> merge" does, whereas I have difficulty understanding what "git
SM> read-tree" or "git subtree" does.
>> `git subtree' is nice when you want subsequent resyncs of the same tree.
>> It can maintain a bijective commit ID mapping between the source repo
>> and the destination repo.
SM> Subtree merges work fine as well for subsequent resyncs of the same
SM> tree, and they don't need to maintain a bijective mapping between the
SM> two (because this mapping is the identity mapping).
A merge is not the same thing as a bijective `git subtree' mapping which
can map paths for each commit. In the ELPA case at least, you're better
off your way. I was just trying to explain what that tool does because
it's been useful to me in the past.
Ted
prev parent reply other threads:[~2014-10-09 15:40 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-07-12 3:26 Elpa packages and Makefiles Eric Abrahamsen
2014-07-12 14:55 ` Grant Rettke
2014-07-13 1:39 ` Eric Abrahamsen
2014-07-18 16:23 ` Stefan Monnier
2014-07-19 0:26 ` Michael Heerdegen
2014-07-19 1:24 ` Eric Abrahamsen
2014-10-01 10:11 ` Eric Abrahamsen
2014-10-01 13:29 ` Stefan Monnier
2014-10-01 14:50 ` Eli Zaretskii
2014-10-01 17:06 ` Eric Abrahamsen
2014-10-08 3:32 ` Eric Abrahamsen
2014-10-08 18:31 ` Stefan Monnier
[not found] ` <mailman.10760.1412793114.1147.help-gnu-emacs@gnu.org>
2014-10-09 13:24 ` Ted Zlatanov
2014-10-09 14:40 ` Stefan Monnier
[not found] ` <mailman.10797.1412865640.1147.help-gnu-emacs@gnu.org>
2014-10-09 15:40 ` Ted Zlatanov [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=m2k349xndb.fsf@lifelogs.com \
--to=tzz@lifelogs.com \
--cc=help-gnu-emacs@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).