Re: Elpa packages and Makefiles

[Eric Abrahamsen]

Stefan Monnier <monnier@iro.umontreal.ca> writes:

>> I started out with putting all the lisp files under a lisp/ directory in
>> the main package directory (for reasons that now escape me). That
>
> GNU ELPA currently will ignore all .el files in subdirectories.
> Just move your files out of the `lisp' dir once and for all.
> You can add a `lisp' symlink (via "ln -s . lisp") for backward
> compatibility if you want, but it's probably not worth the trouble.

Last question! (I hope.)

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?

After I've added my Github upstream as a remote in elpa, and fetched its
branches locally, am I running this:

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

Time spent googling "git subtree" indicated that those were the two
likely possibilities.

Thanks for your patience, and hopefully I can give a little something
back, with a documentation patch for those of us who don't know git all
that well.

Eric