From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Kangas <stefankangas@gmail.com>
Cc: emacs-devel@gnu.org, johnw@gnu.org
Subject: Re: Release branch emacs-29
Date: Tue, 29 Nov 2022 22:00:45 +0200 [thread overview]
Message-ID: <83pmd5ledu.fsf@gnu.org> (raw)
In-Reply-To: <CADwFkm=KP1o85aL1c5xm2SbVEVhyupVMR8uVZg+pzLteKcJLKw@mail.gmail.com> (message from Stefan Kangas on Tue, 29 Nov 2022 11:24:47 -0800)
> From: Stefan Kangas <stefankangas@gmail.com>
> Date: Tue, 29 Nov 2022 11:24:47 -0800
> Cc: John Wiegley <johnw@gnu.org>
>
> Eli Zaretskii <eliz@gnu.org> writes:
>
> > From now on please install bug fixes to the emacs-29 branch (they will be
> > merged to master soon enough), while new features and improvements in
> > existing features should be installed on master.
>
> Now that we have sorted out all copyright assignment details, I have
> pushed a new version of scratch/use-package. Everything that we do not
> have a copyright assignment for has been checked and correctly marked
> with "Copyright-paperwork-exempt: yes".
What is the status of the manual? I don't see any FIXMEs or notes what else
should be done -- is it finished?
Also, I see no announcement on NEWS for use-package -- did I miss it?
> On that branch are the following newly added files:
>
> ├── doc
> │ └── misc
> │ └── use-package.texi
> ├── lisp
> │ └── use-package
> │ ├── bind-chord.el
> │ ├── bind-key.el
> │ ├── use-package-bind-key.el
> │ ├── use-package-chords.el
> │ ├── use-package-core.el
> │ ├── use-package-delight.el
> │ ├── use-package-diminish.el
> │ ├── use-package-ensure-system-package.el
> │ ├── use-package-ensure.el
> │ ├── use-package-jump.el
> │ ├── use-package-lint.el
> │ └── use-package.el
> └── test
> └── lisp
> └── use-package
> ├── use-package-chords-tests.el
> └── use-package-tests.el
>
> 7 directories, 15 files
Btw, I'm quite surprised to see that it's such a large package.
> Is it preferred that I merge to master or emacs-29 at this point?
To emacs-29, please. But it looks like you forked the branch from master,
so you will have to redo that by forking from emacs-29, or else you will
have merge conflicts and/or will undo stuff that was fixed on the release
branch and not yet merged to master.
Thanks.
next prev parent reply other threads:[~2022-11-29 20:00 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-11-28 18:17 Release branch emacs-29 Eli Zaretskii
2022-11-28 19:04 ` Eli Zaretskii
2022-11-29 7:08 ` Bastien
2022-11-29 13:07 ` Eli Zaretskii
2022-11-30 3:46 ` Bastien
2022-11-29 13:26 ` Akib Azmain Turja
2022-11-30 12:32 ` Stefan Monnier
2022-11-30 20:37 ` Akib Azmain Turja
2022-11-30 13:39 ` Eli Zaretskii
2022-11-30 20:44 ` Akib Azmain Turja
2022-12-01 6:05 ` Eli Zaretskii
2022-11-30 16:47 ` Stefan Monnier
2022-11-30 20:36 ` Akib Azmain Turja
2022-12-01 6:03 ` Eli Zaretskii
2022-12-01 16:47 ` Akib Azmain Turja
2022-12-01 18:19 ` Eli Zaretskii
2022-11-29 19:24 ` Stefan Kangas
2022-11-29 20:00 ` Eli Zaretskii [this message]
2022-11-30 15:26 ` Stefan Kangas
2022-12-08 0:20 ` Stefan Kangas
2022-12-08 8:37 ` Eli Zaretskii
2022-12-08 22:20 ` Stefan Kangas
2022-12-09 6:52 ` Eli Zaretskii
2022-12-09 14:35 ` Eli Zaretskii
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=83pmd5ledu.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=johnw@gnu.org \
--cc=stefankangas@gmail.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.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).