From: Ihor Radchenko <yantar92@posteo.net>
To: Kyle Meyer <kyle@kyleam.com>
Cc: Bastien Guerry <bzg@gnu.org>, emacs-orgmode@gnu.org
Subject: Re: Syncing orgcard.tex with upstream Emacs (was: bug#64578: orgcard.tex fixes to allow PDF rendering to be used as a triptych.)
Date: Wed, 06 Dec 2023 14:13:10 +0000 [thread overview]
Message-ID: <87r0jzl8qx.fsf@localhost> (raw)
In-Reply-To: <87ttowt89m.fsf@kyleam.com>
[-- Attachment #1: Type: text/plain, Size: 2091 bytes --]
Kyle Meyer <kyle@kyleam.com> writes:
>> Aside: It appears to be only partially documented in
>> https://orgmode.org/worg/org-maintenance.html#emacs-sync. In particular,
>> the last two lines.
>
> I'm happy to clarify or add to those docs. I didn't write them, but I
> did go through them somewhat recently to better align them with the
> actual porting/syncing process.
>
> With respect to the emacs-sync branch, that page currently says
>
> Typically, Org can be synchronized by copying over files from the
> emacs-sync branch of the Org repository to the master branch of Emacs
> repository. The emacs-sync branch has a few extra changes compared
> with the bugfix branch
>
> Would you like me to add more details about why the branch exists? How
> it's managed? Something else?
I think that a reference to
https://git.kyleam.com/orgmode-backport-notes/tree/orgmode-backports.org#n2
might be helpful. Maybe we should even have that file in the main repo
as a part of emacs-sync branch?
>> May we just add
>>
>>> +\centerline{For more Emacs documentation, and the \TeX{} source for this card, see}
>>> +\centerline{the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}}
>>
>> to Org repo?
>
> These lines (or rather what became these lines) were added in Emacs's
> 4af5981dc75 (Add a comment in generated refcards about the source,
> 2016-11-17). I decided to port that commit to emacs-sync rather than a
> primary Org branch because I felt it only applied to the Org card
> distributed as part of the Emacs tree. From my notes [*]:
>
> I'm skipping this because it isn't true when the card is from the Org
> mode repo.
>
> However, if you prefer to include those lines in Org's copy, that's fine
> by me.
I can see the point. Although, I feel like accumulating such divergence
may backfire after some time. May we possibly resolve the conflict
properly using something like the attached patch?
Then, we can use the same orgcard source but have orgcardemacsnotice.tex
empty in Org repository.
Are there other similar conflicts in emacs-sync branch?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-etc-refcards-orgcard.tex-Put-Emacs-specific-part-int.patch --]
[-- Type: text/x-patch, Size: 1858 bytes --]
From 23a6b95b4755a7a2251e89db6ed91ac8637a8035 Mon Sep 17 00:00:00 2001
Message-ID: <23a6b95b4755a7a2251e89db6ed91ac8637a8035.1701871917.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Wed, 6 Dec 2023 15:09:59 +0100
Subject: [PATCH] etc/refcards/orgcard.tex: Put Emacs-specific part into a
separate file
* etc/refcards/orgcardemacsnotice.tex: New file containing
Emacs-specific copyright notice. This is to be kept in Emacs
repository.
* etc/refcards/orgcard.tex: Include the new file, so that we do not
need to maintain divergence between Org repository version of orgcard
and the Emacs version. The Org version does not refer to Emacs
distribution and the original source.
Link: https://orgmode.org/list/87ttowt89m.fsf@kyleam.com
---
etc/refcards/orgcard.tex | 3 +--
etc/refcards/orgcardemacsnotice.tex | 2 ++
2 files changed, 3 insertions(+), 2 deletions(-)
create mode 100644 etc/refcards/orgcardemacsnotice.tex
diff --git a/etc/refcards/orgcard.tex b/etc/refcards/orgcard.tex
index 4b73a544e80..9d875e0f201 100644
--- a/etc/refcards/orgcard.tex
+++ b/etc/refcards/orgcard.tex
@@ -79,8 +79,7 @@
\centerline{Released under the terms of the GNU General Public License}
\centerline{version 3 or later.}
-\centerline{For more Emacs documentation, and the \TeX{} source for this card, see}
-\centerline{the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}}
+\input orgcardemacsnotice.tex
\endgroup}
diff --git a/etc/refcards/orgcardemacsnotice.tex b/etc/refcards/orgcardemacsnotice.tex
new file mode 100644
index 00000000000..ce7117c2330
--- /dev/null
+++ b/etc/refcards/orgcardemacsnotice.tex
@@ -0,0 +1,2 @@
+\centerline{For more Emacs documentation, and the \TeX{} source for this card, see}
+\centerline{the Emacs distribution, or {\tt https://www.gnu.org/software/emacs}}
--
2.42.0
[-- Attachment #3: Type: text/plain, Size: 224 bytes --]
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
next prev parent reply other threads:[~2023-12-06 14:11 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <CAGQFwfgr-=jqC_SKLnsHxXgABhoZRTGL_ZYwuu0EgJ7YAG0wPw@mail.gmail.com>
[not found] ` <874jm8ythh.fsf@localhost>
[not found] ` <875y4bbz13.fsf@localhost>
[not found] ` <87r0kr9xke.fsf@localhost>
[not found] ` <871qcl33o2.fsf@gnu.org>
[not found] ` <CAGQFwfhFV97eAwWYN_P6EoVEHeS+sH2oOM0_0Qwac8zzspSnjg@mail.gmail.com>
[not found] ` <87ttoym8qu.fsf@localhost>
[not found] ` <CAGQFwfii4m8_i9Y-4GdUNMggzmYuc2uMu9aT7Zmg8x5oUi6-uQ@mail.gmail.com>
[not found] ` <CAGQFwfifY_rNYLBwNz0prQVE2YHiekciAVp6JHTtHi0ZwoGKEw@mail.gmail.com>
[not found] ` <87wmttti1k.fsf@kyleam.com>
2023-12-05 12:37 ` Syncing orgcard.tex with upstream Emacs (was: bug#64578: orgcard.tex fixes to allow PDF rendering to be used as a triptych.) Ihor Radchenko
2023-12-06 1:44 ` Kyle Meyer
2023-12-06 14:13 ` Ihor Radchenko [this message]
2023-12-07 4:53 ` Kyle Meyer
2023-12-07 10:42 ` Ihor Radchenko
2023-12-08 3:14 ` Kyle Meyer
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=87r0jzl8qx.fsf@localhost \
--to=yantar92@posteo.net \
--cc=bzg@gnu.org \
--cc=emacs-orgmode@gnu.org \
--cc=kyle@kyleam.com \
/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).