unofficial mirror of emacs-devel@gnu.org 
 help / color / mirror / code / Atom feed
From: Dmitry Gutov <dgutov@yandex.ru>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: Andreas Schwab <schwab@linux-m68k.org>, emacs-devel@gnu.org
Subject: Re: Git version of ELPA
Date: Mon, 12 Aug 2013 09:17:01 +0300	[thread overview]
Message-ID: <52087DDD.1020100@yandex.ru> (raw)
In-Reply-To: <jwvvc3bsolm.fsf-monnier+emacs@gnu.org>

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.



  parent reply	other threads:[~2013-08-12  6:17 UTC|newest]

Thread overview: 25+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-01 17:54 Git version of ELPA Stefan Monnier
2013-08-02 10:30 ` Andreas Schwab
2013-08-02 17:22   ` Stefan Monnier
2013-08-02 21:32     ` Andreas Schwab
2013-08-03  4:28       ` Stefan Monnier
2013-08-03  8:19         ` Eli Zaretskii
2013-08-11 22:08         ` Dmitry Gutov
2013-08-12  1:10           ` Stefan Monnier
2013-08-12  2:04             ` Stefan Monnier
2013-08-12  6:17             ` Dmitry Gutov [this message]
2013-08-12 15:24               ` Stefan Monnier
2013-08-12 16:23                 ` Dmitry Gutov
2013-08-13  1:42                   ` Stefan Monnier
2013-08-14  9:17                     ` Dmitry Gutov
2013-08-14 15:30                       ` Stefan Monnier
2013-08-14 16:48                         ` Dmitry Gutov
2013-08-14 19:02                           ` Stefan Monnier
2013-08-14 20:46                             ` Dmitry Gutov
2013-08-16 23:04                               ` Dmitry Gutov
2013-08-15  4:08                             ` Stephen J. Turnbull
2013-08-15 18:38                               ` Achim Gratz
2013-08-17  0:59                         ` Dmitry Gutov
2013-08-13  5:16                   ` Achim Gratz
2013-08-14  9:46                     ` Dmitry Gutov
2013-08-14 18:13                       ` Achim Gratz

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=52087DDD.1020100@yandex.ru \
    --to=dgutov@yandex.ru \
    --cc=emacs-devel@gnu.org \
    --cc=monnier@iro.umontreal.ca \
    --cc=schwab@linux-m68k.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.
Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/emacs.git

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).