From: Dmitry Gutov <dgutov@yandex.ru>
To: Stefan Monnier <monnier@IRO.UMontreal.CA>
Cc: emacs-devel@gnu.org
Subject: Re: Git version of ELPA
Date: Wed, 14 Aug 2013 23:46:10 +0300 [thread overview]
Message-ID: <520BEC92.401@yandex.ru> (raw)
In-Reply-To: <jwv4nasjdzf.fsf-monnier+emacs@gnu.org>
On 14.08.2013 22:02, Stefan Monnier wrote:
>>>> 2) If packages/js2-mode and git@github.com:mooz/js2-mode.git differ
>>>> in files they contain, I imagine we'll have more errors or conflicts
>>>> to deal with.
>>> Yes and no: the "push" would simply force the github version to have
>>> the same content as the elpa version.
>> The push just after the removal commit would end up fine.
>
> No, by definition "push" gives you an exact copy at the other end.
Yes, sorry. You're right, of course.
As long as you've resolved all the conflicts during the previous merge,
and the remote head is a proper ancestor of the local head, the push
will succeed.
Which, in the described situation, is arguably worse than failure.
>>> A simple solution is to not remove those files from the `elpa' branch.
>>> I.e. consider it as a "local change". It might lead to spurious
>>> conflicts when merging, tho.
>> Not sure I understand. I didn't suggest removing them.
>> What changes, and "local" to what?
>
> Changes, as in "file removal", "file renaming", ...
> Local to the `elpa' version.
Ah, ok. I guess the "not" in "to not remove" above was a typo.
>> Exclusions are fine by me, too. So, file name ".elpaignore", syntax similar
>> to ".gitignore" (one glob per line)?
>
> Syntax: whatever "tar" accepts.
Sounds good.
Speaking of README file formats, maybe your current solution is good
enough. The Melpa guys have intentionally settled on the same approach
(use the Commentary from <package-name>.el):
https://github.com/milkypostman/melpa/issues/522
https://github.com/milkypostman/melpa/pull/366
The idea is that README.md/org/etc in the root of the directory serves
as an introduction, and it usually contains a section "how to install".
The package description buffer, on the other hand, would be most useful
if it has a short description of what the package is about and how to
use it *once it's installed*.
I'm not sure if I fully agree with that reasoning, but doing readme
generation the same way across package repositories would be good.
next prev parent reply other threads:[~2013-08-14 20:46 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
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 [this message]
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=520BEC92.401@yandex.ru \
--to=dgutov@yandex.ru \
--cc=emacs-devel@gnu.org \
--cc=monnier@IRO.UMontreal.CA \
/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).