From: Tassilo Horn <tsdh@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: [elpa] branch externals/auctex updated (8a181ee -> a54b985)
Date: Sun, 02 Nov 2014 20:19:22 +0100 [thread overview]
Message-ID: <87fve14dhh.fsf@thinkpad-t440p.tsdh.org> (raw)
In-Reply-To: <jwvmw8a5s6i.fsf-monnier+emacsdiffs@gnu.org> (Stefan Monnier's message of "Sat, 01 Nov 2014 21:11:42 -0400")
Stefan Monnier <monnier@iro.umontreal.ca> writes:
>> And then I wanted to ask you if we could arrange it that ELPA auctex
>> and main auctex (where we probably need to put some generated files
>> under VCS that can't be generated on ELPA) are actually the very same
>> thing.
>
> That would be great. Last time this was discussed it seemed that some
> differences were difficult to remove (such as the auto-generated
> files).
I much prefer to have some generated files under version control if that
makes merging easier.
>> So from your reaction, it seems that this has already been the
>> case...
>
> No, what we had before your commit is that the elpa.git code had the
> metadata in order so that you could "git merge" from the upstream
> AUCTeX code, with potentially some merge problems to solve since some
> files have different names.
>
> I've just reverted your patch.
Ok, and thanks for doing the merge!
Bye,
Tassilo
next prev parent reply other threads:[~2014-11-02 19:19 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <20141101064856.5840.32625@vcs.savannah.gnu.org>
2014-11-01 13:01 ` [elpa] branch externals/auctex updated (8a181ee -> a54b985) Stefan Monnier
2014-11-01 13:48 ` Tassilo Horn
2014-11-02 1:11 ` Stefan Monnier
2014-11-02 19:19 ` Tassilo Horn [this message]
2014-11-03 2:41 ` Stefan Monnier
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=87fve14dhh.fsf@thinkpad-t440p.tsdh.org \
--to=tsdh@gnu.org \
--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).