[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
emacs-27 0bc4b00: ; emacs-26 → emacs-27
emacs-27 0bc4b00: ; emacs-26 → emacs-27
Sat, 30 Jan 2021 21:42:27 -0500 (EST)
Author: Stefan Kangas <firstname.lastname@example.org>
Commit: Stefan Kangas <email@example.com>
; emacs-26 → emacs-27
admin/gitmerge.el | 2 +-
admin/make-tarball.txt | 2 +-
admin/notes/git-workflow | 20 ++++++++++----------
nt/INSTALL.W64 | 14 +++++++-------
4 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/admin/gitmerge.el b/admin/gitmerge.el
index b21cb3b..be946f3 100644
@@ -126,7 +126,7 @@ If nil, the function `gitmerge-default-branch' guesses.")
(string-to-number (match-string 1))))
(defun gitmerge-default-branch ()
- "Default for branch that should be merged; eg \"origin/emacs-26\"."
+ "Default for branch that should be merged; eg \"origin/emacs-27\"."
(format "origin/emacs-%s" (1- (gitmerge-emacs-version)))))
diff --git a/admin/make-tarball.txt b/admin/make-tarball.txt
index 5125086..907afbb 100644
@@ -5,7 +5,7 @@ Instructions to create pretest or release tarballs. -*- coding:
Steps to take before starting on the first pretest in any release sequence:
-0. The release branch (e.g. emacs-26) should already have been made
+0. The release branch (e.g. emacs-27) should already have been made
and you should use it for all that follows. Diffs from this
branch should be going to the emacs-diffs mailing list.
diff --git a/admin/notes/git-workflow b/admin/notes/git-workflow
index 28b6f91..143520c 100644
@@ -15,14 +15,14 @@ Initial setup
Then we want to clone the repository. We normally want to have both
-the current master and the emacs-26 branch.
+the current master and the emacs-27 branch.
git clone <membername>@git.sv.gnu.org:/srv/git/emacs.git master
git config push.default current
-git worktree add ../emacs-26 emacs-26
+git worktree add ../emacs-27 emacs-27
You now have both branches conveniently accessible, and you can do
"git pull" in them once in a while to keep updated.
@@ -52,11 +52,11 @@ you commit your change locally and then send a patch file
as a bug report
as described in ../../CONTRIBUTE.
-Backporting to emacs-26
+Backporting to emacs-27
If you have applied a fix to the master, but then decide that it should
-be applied to the emacs-26 branch, too, then
+be applied to the emacs-27 branch, too, then
@@ -66,7 +66,7 @@ which will look like
git cherry-pick -xe 958b768a6534ae6e77a8547a56fc31b46b63710b
and add "Backport:" to the commit string. Then
@@ -74,17 +74,17 @@ and add "Backport:" to the commit string. Then
-Merging emacs-26 to the master
+Merging emacs-27 to the master
It is recommended to use the file gitmerge.el in the admin directory
-for merging 'emacs-26' into 'master'. It will take care of many
+for merging 'emacs-27' into 'master'. It will take care of many
things which would otherwise have to be done manually, like ignoring
commits that should not land in master, fixing up ChangeLogs and
automatically dealing with certain types of conflicts. If you really
want to, you can do the merge manually, but then you're on your own.
If you still choose to do that, make absolutely sure that you *always*
-use the 'merge' command to transport commits from 'emacs-26' to
+use the 'merge' command to transport commits from 'emacs-27' to
'master'. *Never* use 'cherry-pick'! If you don't know why, then you
shouldn't manually do the merge in the first place; just use
@@ -97,11 +97,11 @@ up-to-date by doing a pull. Then start Emacs with
emacs -l admin/gitmerge.el -f gitmerge
You'll be asked for the branch to merge, which will default to
-'origin/emacs-26', which you should accept. Merging a local tracking
+'origin/emacs-27', which you should accept. Merging a local tracking
branch is discouraged, since it might not be up-to-date, or worse,
contain commits from you which are not yet pushed upstream.
-You will now see the list of commits from 'emacs-26' which are not yet
+You will now see the list of commits from 'emacs-27' which are not yet
merged to 'master'. You might also see commits that are already
marked for "skipping", which means that they will be merged with a
different merge strategy ('ours'), which will effectively ignore the
diff --git a/nt/INSTALL.W64 b/nt/INSTALL.W64
index fdda1ad..32170bd 100644
@@ -95,19 +95,19 @@ Savannah Emacs site,
The Emacs ftp site is located at https://ftp.gnu.org/gnu/emacs/ - download the
version you want to build and put the file into a location like C:\emacs\,
then uncompress it with tar. This will put the Emacs source into a folder like
- tar xJf emacs-24.5.tar.xz
+ tar xJf emacs-27.1.tar.xz
** From the Git repository
To download the Git repository, do something like the following -- this will
-put the Emacs source into C:\emacs\emacs-26:
+put the Emacs source into C:\emacs\emacs-27:
- git clone git://git.sv.gnu.org/emacs.git emacs-26
+ git clone git://git.sv.gnu.org/emacs.git emacs-27
(We recommend using the command shown on Savannah Emacs project page.)
@@ -120,7 +120,7 @@ First we need to switch to the MinGW-w64 environment. Exit
the MSYS2 BASH
console and run mingw64.exe in the C:\msys64 folder, then cd back to
your Emacs source directory, e.g.:
- cd /c/emacs/emacs-26
+ cd /c/emacs/emacs-27
** Run autogen
@@ -137,14 +137,14 @@ that the example given here is just a simple one - for
on the options available please see the INSTALL file in this directory.
The '--prefix' option specifies a location for the resulting binary files,
-which 'make install' will use - in this example we set it to C:\emacs\emacs-26.
+which 'make install' will use - in this example we set it to C:\emacs\emacs-27.
If a prefix is not specified the files will be put in the standard Unix
directories located in your C:\msys64 directory, but this is not recommended.
Note also that we need to disable D-Bus because Emacs does not yet
support them on Windows.
- ./configure --prefix=/c/emacs/emacs-26 --without-dbus
+ ./configure --prefix=/c/emacs/emacs-27 --without-dbus
** Run make
|[Prev in Thread]
||[Next in Thread]|
- emacs-27 0bc4b00: ; emacs-26 → emacs-27,
Stefan Kangas <=