From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Lluís <xscript@gmx.net>
Cc: emacs-devel@gnu.org
Subject: Re: Keeping changes in sync with upstream projects
Date: Tue, 18 May 2010 16:55:48 -0400 [thread overview]
Message-ID: <jwv7hn1rlh4.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <86zkzxccfw.wl%lluis@ginnungagap.pc.ac.upc.edu> ("Lluís"'s message of "Tue, 18 May 2010 20:05:55 +0200")
These are very good questions, thanks for asking.
The Gnus guys have their own answer to that (not sure how advanced it
is by now), so maybe they could say how well it works for them.
The 2-way sync is the harder part. And doing it *with* differences
(aka "discarded/held changesets"), it's even worse.
So I think the right course of action is something like:
- start with 4 version of the code:
[upstream] <-> [clean upstream] <-> [clean Emacs] <-> [Emacs]
where "clean upstream" means "upstream without the patches that
shouldn't make it into Emacs" and "clean Emacs" means "Emacs without
the changes that shouldn't make it into upstream". I.e. [clean
upstream] and [clean Emacs] should be virtually identical, except
maybe for file layout and VCS.
- first simplification: reject Emacs patches that can't make it
into upstream. I.e. enforce [clean Emacs] == [Emacs].
That means that when an Emacs patch is unacceptable upstream, it needs
to be resolved somehow: either one side convinces the other, or the
patch needs to be reworked. Typically such changes are linked to
features that don't exist/work in XEmacs or in older Emacsen, so the
problem can resolved by adding compatibility code.
- second simplification: don't install into [upstream] patches that
should make it into Emacs; instead install them into [clean upstream].
- the flow is now limited:
[upstream] <- [clean upstream] <-> [Emacs]
- so [upstream] is basically a normal feature-branch that tracks the
"trunk" aka [clean upstream]. Any DVCS will handle that just fine.
- so all that's left is the core 2-way sync. I don't know of any
easy/right way to do that.
- of course, the best is to add a third simplification: let upstream use
[Emacs] for development, so the "2-way" sync is a nop.
Stefan
next prev parent reply other threads:[~2010-05-18 20:55 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-18 18:05 Keeping changes in sync with upstream projects Lluís
2010-05-18 20:55 ` Stefan Monnier [this message]
2010-05-19 10:35 ` mathias
2010-05-19 13:45 ` 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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwv7hn1rlh4.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=xscript@gmx.net \
/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 external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.