[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Git version of ELPA
From: |
Dmitry Gutov |
Subject: |
Re: Git version of ELPA |
Date: |
Mon, 12 Aug 2013 09:17:01 +0300 |
User-agent: |
Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130803 Thunderbird/17.0.8 |
On 12.08.2013 04:10, Stefan Monnier wrote:
I imagine that's going to complicate the merging procedure.
After having tried the "subtree" merging a few times, I think it'll
be manageable (and is a problem which won't recur, so I'm not too
worried).
So, you've tried merging commits from upstream that include files not
present in ELPA? And splitting commits from ELPA to push them to
upstream repositories? And both work fine?
> Of course, if there's a better Git tree available, I'll happily switch
> to that one.
A little while back Jorgen wrote a recipe how to do that:
http://lists.gnu.org/archive/html/emacs-devel/2013-03/msg00235.html
I've yet to wrap my head around this git subtree business properly, but
if it helps, I can try to follow it myself, and publish the result.
It raises a few questions, though. Up until now, the elpa branch has
been receiving its contents in preprocessed form:
1) Some files and directories removed.
2) -pkg.el files pre-generated and included.
For example, just compare
http://repo.or.cz/w/emacs.git/tree/dbb5d60608ae6b99910b0c374f82b63fde526abf:/packages/yasnippet
and
https://github.com/capitaomorte/yasnippet/
My question is, will elpa publishing script work if packages/yasnippet
contains (just) the files from the upstream repository? I imagine
there'll have to be some adaptation.
- Git version of ELPA, Stefan Monnier, 2013/08/01
- Re: Git version of ELPA, Andreas Schwab, 2013/08/02
- Re: Git version of ELPA, Stefan Monnier, 2013/08/02
- Re: Git version of ELPA, Andreas Schwab, 2013/08/02
- Re: Git version of ELPA, Stefan Monnier, 2013/08/03
- Re: Git version of ELPA, Eli Zaretskii, 2013/08/03
- Re: Git version of ELPA, Dmitry Gutov, 2013/08/11
- Re: Git version of ELPA, Stefan Monnier, 2013/08/11
- Re: Git version of ELPA, Stefan Monnier, 2013/08/11
- Re: Git version of ELPA,
Dmitry Gutov <=
- Re: Git version of ELPA, Stefan Monnier, 2013/08/12
- Re: Git version of ELPA, Dmitry Gutov, 2013/08/12
- Re: Git version of ELPA, Stefan Monnier, 2013/08/12
- Re: Git version of ELPA, Dmitry Gutov, 2013/08/14
- Re: Git version of ELPA, Stefan Monnier, 2013/08/14
- Re: Git version of ELPA, Dmitry Gutov, 2013/08/14
- Re: Git version of ELPA, Stefan Monnier, 2013/08/14
- Re: Git version of ELPA, Dmitry Gutov, 2013/08/14
- Re: Git version of ELPA, Dmitry Gutov, 2013/08/16
- Re: Git version of ELPA, Stephen J. Turnbull, 2013/08/15