From: Neil Jerram <neil@ossau.homelinux.net>
To: Rasmus Pank Roulund <rasmus@gmx.us>, kyle@kyleam.com
Cc: emacs-orgmode@gnu.org
Subject: Re: Upstream synchronization documentation
Date: Tue, 04 Jul 2017 01:39:38 +0100 [thread overview]
Message-ID: <20170704003938.5992530.16448.71957@ossau.homelinux.net> (raw)
In-Reply-To: <87wp7pwhpn.fsf@gmx.us>
No problem to stick with 'backport' if that is the conventional term here. Thanks for considering and explaining the point.
Neil
Original Message
From: Rasmus Pank Roulund
Sent: Monday, 3 July 2017 18:22
To: kyle@kyleam.com
Cc: neil@ossau.homelinux.net; emacs-orgmode@gnu.org
Subject: Re: [O] Upstream synchronization documentation
Kyle Meyer <kyle@kyleam.com> writes:
>> Whereas in your text I think it is the other way round, isn't it?
>> (I.e. the Emacs branch is more stable, and you are talking about
>> porting a fix that someone has made in that branch to the Org master.)
>> So perhaps 'forward port' would be clearer?
>
> I suspect that Org's maint (where the Emacs changes land) is generally
> more stable than the Org in Emacs's master, but, yes, Emacs's version is
> the older version. (Well, with v9.0.9 just synced the versions match,
> but maint still has quite a few more commits.)
>
> Since before I took over "backporting" changes from the Emacs repo, it's
> been referred to as this. Although I agree it isn't great word choice,
> I'd prefer that we remain consistent so that, for example, "git log -i
> --grep=backport" remains informative.
>
> But if people think using "backport" is too confusing, I'm OK switching
> to another term. Of "forward port" and "propagate" (suggested in this
> thread by Eric), I prefer "propagate"---or maybe just "port", though
> grepping for that might lead to too many false positives. And if we
> stick with "backport", it still might be a good idea to clarify in
> README_maintainer that we're abusing the term.
So at least I’m not crazy for "coming up with" it backporting!
So I will keep calling it "backporting" but explain that it is more like
propagating changes from the Emacs repository (back) to the Org
repository.
Thanks,
Rasmus
--
Dung makes an excellent fertilizer
next prev parent reply other threads:[~2017-07-04 0:39 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-03 10:35 Upstream synchronization documentation Rasmus
2017-07-03 11:01 ` Neil Jerram
2017-07-03 15:06 ` Kyle Meyer
2017-07-03 17:31 ` Rasmus Pank Roulund
2017-07-04 0:39 ` Neil Jerram [this message]
[not found] ` <2c3a774dd5014c46983c98c8a00758e3@HE1PR01MB1898.eurprd01.prod.exchangelabs.com>
2017-07-03 12:11 ` Eric S Fraga
2017-07-03 19:36 ` Kyle Meyer
2017-07-04 6:50 ` Rasmus
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.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170704003938.5992530.16448.71957@ossau.homelinux.net \
--to=neil@ossau.homelinux.net \
--cc=emacs-orgmode@gnu.org \
--cc=kyle@kyleam.com \
--cc=rasmus@gmx.us \
/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/org-mode.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).