* Review: make-tarball.txt
@ 2010-02-25 3:32 Christoph
2010-02-25 9:22 ` Andreas Schwab
0 siblings, 1 reply; 3+ messages in thread
From: Christoph @ 2010-02-25 3:32 UTC (permalink / raw)
To: emacs-devel
Hi,
I saw that make-tarball.txt in the admin directory was still referring
to CSV in the instructions.
I would like to propose the following changes:
=== modified file 'admin/make-tarball.txt'
--- admin/make-tarball.txt 2010-01-04 05:35:18 +0000
+++ admin/make-tarball.txt 2010-02-25 02:57:10 +0000
@@ -4,7 +4,7 @@
For each step, check for possible errors.
-1. cvs -q update -Pd
+1. bzr update
2. Bootstrap to make 100% sure all elc files are up-to-date, and to
make sure that the later tagged version will bootstrap, should it be
@@ -56,23 +56,26 @@
number of the old Emacs to __, do the same with the new log and do
M-x ediff. Especially check that Info files aren't built.
-10. cd EMACS_ROOT_DIR; cvs tag TAG
+10. cd EMACS_ROOT_DIR/trunk
+ bzr tag TAG
TAG is EMACS_PRETEST_XX_YY_ZZZ for a pretest, EMACS_XX_YY for a
release.
Shortly before the release, cut the branch with the following
commands:
- cvs rtag EMACS_`NUMBER'_BASE
- cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE
-
+ bzr tag EMACS_`NUMBER'_BASE
+ bzr branch -r tag:EMACS_`NUMBER'_BASE ./ ../EMACS_`NUMBER'_RC
+
where `NUMBER' is the major version number of the release. This
makes it easier to see what changes have been applied to the
branch with:
- cvs diff -r EMACS_`NUMBER'_BASE -r EMACS_`NUMBER'_RC
+ bzr diff -r tag:EMACS_`NUMBER'_BASE
- or merge changes back to the trunk with "cvs update -j", if
- necessary.
+ or merge changes back to the trunk with
+
+ cd EMACS_ROOT_DIR/trunk
+ bzr merge ../EMACS_`NUMBER'_RC
After doing this, increase the version number on the trunk as per
step 4.
Any feedback is appreciated.
Christoph
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Review: make-tarball.txt
2010-02-25 3:32 Review: make-tarball.txt Christoph
@ 2010-02-25 9:22 ` Andreas Schwab
2010-03-02 4:26 ` Christoph
0 siblings, 1 reply; 3+ messages in thread
From: Andreas Schwab @ 2010-02-25 9:22 UTC (permalink / raw)
To: Christoph; +Cc: emacs-devel
Christoph <cschol2112@googlemail.com> writes:
> + bzr tag EMACS_`NUMBER'_BASE
There is no need for the base tag any more.
> + bzr branch -r tag:EMACS_`NUMBER'_BASE ./ ../EMACS_`NUMBER'_RC
The branch should get a less shouting name, like emacs-$NUMBER. (The RC
suffix has always been a stupid convention.)
Andreas.
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Review: make-tarball.txt
2010-02-25 9:22 ` Andreas Schwab
@ 2010-03-02 4:26 ` Christoph
0 siblings, 0 replies; 3+ messages in thread
From: Christoph @ 2010-03-02 4:26 UTC (permalink / raw)
To: Andreas Schwab; +Cc: emacs-devel
On 2/25/2010 2:22 AM, Andreas Schwab wrote:
> Christoph<cschol2112@googlemail.com> writes:
>
>> + bzr tag EMACS_`NUMBER'_BASE
>>
> There is no need for the base tag any more.
>
>
>> + bzr branch -r tag:EMACS_`NUMBER'_BASE ./ ../EMACS_`NUMBER'_RC
>>
> The branch should get a less shouting name, like emacs-$NUMBER. (The RC
> suffix has always been a stupid convention.)
>
> Andreas
Andreas,
What would you propose?
Just
bzr branch ./ ../emacs-$NUMBER
to cut the branch for release?
Christoph
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-03-02 4:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-02-25 3:32 Review: make-tarball.txt Christoph
2010-02-25 9:22 ` Andreas Schwab
2010-03-02 4:26 ` Christoph
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).