* Branching
@ 2009-06-19 17:59 Chong Yidong
2009-06-19 18:08 ` Branching Chong Yidong
0 siblings, 1 reply; 13+ messages in thread
From: Chong Yidong @ 2009-06-19 17:59 UTC (permalink / raw
To: emacs-devel
As mentioned in an earlier email, we can now cut the CVS branch for
Emacs 23. Any futher 23.0.xx pretest(s), and the 23.1 release, will
come from the branch.
As currently planned, we'll use the trunk for developing 23.2. But if a
bugfix-only release proves necessary (e.g. if serious bugs come to light
after we release 23.1), we can change course and make 23.2 from the
branch while bumping the trunk release to 23.3, similar to the original
development plan for the Emacs 21 series.
Has anyone given thought to the branch tag? If we follow previous
conventions, we'd name the branch EMACS_23_BASE, but this is somewhat
misleading.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-19 17:59 Branching Chong Yidong
@ 2009-06-19 18:08 ` Chong Yidong
2009-06-21 1:33 ` Branching Glenn Morris
0 siblings, 1 reply; 13+ messages in thread
From: Chong Yidong @ 2009-06-19 18:08 UTC (permalink / raw
To: emacs-devel
> Has anyone given thought to the branch tag? If we follow previous
> conventions, we'd name the branch EMACS_23_BASE, but this is somewhat
> misleading.
I think what we want is to tag the current HEAD as EMACS_23_BASE, and
create the EMACS_23_1_RC branch from that tag. Correct?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-19 18:08 ` Branching Chong Yidong
@ 2009-06-21 1:33 ` Glenn Morris
2009-06-21 3:23 ` Branching Miles Bader
2009-06-21 5:06 ` Branching Chong Yidong
0 siblings, 2 replies; 13+ messages in thread
From: Glenn Morris @ 2009-06-21 1:33 UTC (permalink / raw
To: Chong Yidong; +Cc: emacs-devel
Chong Yidong wrote:
>> Has anyone given thought to the branch tag? If we follow previous
>> conventions, we'd name the branch EMACS_23_BASE, but this is somewhat
>> misleading.
That was a mistake, not a convention. :)
> I think what we want is to tag the current HEAD as EMACS_23_BASE, and
> create the EMACS_23_1_RC branch from that tag. Correct?
EMACS_23_1_BASE and EMACS_23_1_RC would be consistent with 21.
admin/make-tarball.txt says:
cvs rtag EMACS_`NUMBER'_BASE
cvs rtag -b EMACS_`NUMBER'_RC -r EMACS_`NUMBER'_BASE
If this is wrong, it should be corrected.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-21 1:33 ` Branching Glenn Morris
@ 2009-06-21 3:23 ` Miles Bader
2009-06-21 5:06 ` Branching Chong Yidong
1 sibling, 0 replies; 13+ messages in thread
From: Miles Bader @ 2009-06-21 3:23 UTC (permalink / raw
To: emacs-devel
Glenn Morris <rgm@gnu.org> writes:
>>> Has anyone given thought to the branch tag? If we follow previous
>>> conventions, we'd name the branch EMACS_23_BASE, but this is somewhat
>>> misleading.
>
> That was a mistake, not a convention. :)
Yeah, let's not repeat it... :O
-Miles
--
Selfish, adj. Devoid of consideration for the selfishness of others.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-21 1:33 ` Branching Glenn Morris
2009-06-21 3:23 ` Branching Miles Bader
@ 2009-06-21 5:06 ` Chong Yidong
2009-06-21 6:45 ` Branching Nick Roberts
` (3 more replies)
1 sibling, 4 replies; 13+ messages in thread
From: Chong Yidong @ 2009-06-21 5:06 UTC (permalink / raw
To: emacs-devel
Okay. I made the EMACS_23_1_RC branch, coinciding with the
EMACS_23_1_BASE tag on HEAD. The version number on the trunk is now
23.1.50. (Hopefully, no mistakes in CVS usage this time round ;-)
To switch to tracking the branch in your CVS tree, do
cvs up -r EMACS_23_1_RC
The branch will be used to release 23.1. Until then, whenever you
commit a fix that is intended for inclusion in 23.1, please check it
into *both* the branch and the trunk.
(After the 23.1 release, it will no longer be necessary to commit to the
branch. If, for whatever reason, we later decide to change course and
make a 23.2 bugfix-only release from the branch rather than the trunk,
we'll port the necessary fixes to the branch.)
The trunk is now open for all non-regression bugfixes. New features can
also be added to the trunk, but please discuss on emacs-devel first.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-21 5:06 ` Branching Chong Yidong
@ 2009-06-21 6:45 ` Nick Roberts
2009-06-21 14:36 ` Branching Chong Yidong
2009-06-21 15:43 ` Branching Michael Albinus
` (2 subsequent siblings)
3 siblings, 1 reply; 13+ messages in thread
From: Nick Roberts @ 2009-06-21 6:45 UTC (permalink / raw
To: Chong Yidong; +Cc: emacs-devel
I think it's a good idea to put
2009-06-21 Chong Yidong <cyd@stupidchicken.com>
* Branch for 23.1.
in the Changelogs so that people understand why some changes that have entries *before*:
* Version 23.1 released.
are not included in the release (and can see what is in the release while on trunk). I think
that I may have done this last time in src/ChangeLog.10 (in your name):
2007-04-24 Chong Yidong <cyd@stupidchicken.com>
* Branch for 22.1.
because I got confused about my GPM changes.
--
Nick http://www.inet.net.nz/~nickrob
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-21 6:45 ` Branching Nick Roberts
@ 2009-06-21 14:36 ` Chong Yidong
0 siblings, 0 replies; 13+ messages in thread
From: Chong Yidong @ 2009-06-21 14:36 UTC (permalink / raw
To: Nick Roberts; +Cc: emacs-devel
nickrob@snap.net.nz (Nick Roberts) writes:
> I think it's a good idea to put
>
> 2009-06-21 Chong Yidong <cyd@stupidchicken.com>
>
> * Branch for 23.1.
>
> in the Changelogs so that people understand why some changes that have
> entries *before*:
>
> * Version 23.1 released.
>
> are not included in the release (and can see what is in the release
> while on trunk).
Done, thanks.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-21 5:06 ` Branching Chong Yidong
2009-06-21 6:45 ` Branching Nick Roberts
@ 2009-06-21 15:43 ` Michael Albinus
2009-06-21 18:59 ` Branching Chong Yidong
2009-06-22 2:25 ` Branching Glenn Morris
2009-06-24 21:15 ` Branching Stefan Monnier
3 siblings, 1 reply; 13+ messages in thread
From: Michael Albinus @ 2009-06-21 15:43 UTC (permalink / raw
To: Chong Yidong; +Cc: emacs-devel
Chong Yidong <cyd@stupidchicken.com> writes:
> New features can also be added to the trunk, but please discuss on
> emacs-devel first.
I'm thinking about upgrade to Tramp 2.1.16. It contains a new package,
tramp-gvfs.el, which offers the new connection methods "obex", "dav" and
"davs". Internally, the GVFS fuse filesystem will be used for these new
methods, via D-Bus.
Any objections to install it in the trunk?
Best regards, Michael.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-21 15:43 ` Branching Michael Albinus
@ 2009-06-21 18:59 ` Chong Yidong
0 siblings, 0 replies; 13+ messages in thread
From: Chong Yidong @ 2009-06-21 18:59 UTC (permalink / raw
To: Michael Albinus; +Cc: emacs-devel
Michael Albinus <michael.albinus@gmx.de> writes:
> I'm thinking about upgrade to Tramp 2.1.16. It contains a new package,
> tramp-gvfs.el, which offers the new connection methods "obex", "dav" and
> "davs". Internally, the GVFS fuse filesystem will be used for these new
> methods, via D-Bus.
>
> Any objections to install it in the trunk?
I have no objections.
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-21 5:06 ` Branching Chong Yidong
2009-06-21 6:45 ` Branching Nick Roberts
2009-06-21 15:43 ` Branching Michael Albinus
@ 2009-06-22 2:25 ` Glenn Morris
2009-06-22 7:02 ` Branching Yavor Doganov
2009-06-24 21:15 ` Branching Stefan Monnier
3 siblings, 1 reply; 13+ messages in thread
From: Glenn Morris @ 2009-06-22 2:25 UTC (permalink / raw
To: Chong Yidong; +Cc: emacs-devel
Chong Yidong wrote:
> Okay. I made the EMACS_23_1_RC branch, coinciding with the
> EMACS_23_1_BASE tag on HEAD.
I forget; do we need to make a Savannah support request to have
changes in this branch sent to the emacs-diffs mailing list?
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-22 2:25 ` Branching Glenn Morris
@ 2009-06-22 7:02 ` Yavor Doganov
2009-06-22 7:08 ` Branching Glenn Morris
0 siblings, 1 reply; 13+ messages in thread
From: Yavor Doganov @ 2009-06-22 7:02 UTC (permalink / raw
To: emacs-devel
Glenn Morris wrote:
> I forget; do we need to make a Savannah support request to have
> changes in this branch sent to the emacs-diffs mailing list?
Yes. (But not this time, as I've just done that.)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-22 7:02 ` Branching Yavor Doganov
@ 2009-06-22 7:08 ` Glenn Morris
0 siblings, 0 replies; 13+ messages in thread
From: Glenn Morris @ 2009-06-22 7:08 UTC (permalink / raw
To: yavor; +Cc: emacs-devel
Yavor Doganov wrote:
> Yes. (But not this time, as I've just done that.)
Thanks for the service!
(Procedure noted for future reference in admin/make-tarball.txt.)
^ permalink raw reply [flat|nested] 13+ messages in thread
* Re: Branching
2009-06-21 5:06 ` Branching Chong Yidong
` (2 preceding siblings ...)
2009-06-22 2:25 ` Branching Glenn Morris
@ 2009-06-24 21:15 ` Stefan Monnier
3 siblings, 0 replies; 13+ messages in thread
From: Stefan Monnier @ 2009-06-24 21:15 UTC (permalink / raw
To: Chong Yidong; +Cc: emacs-devel
> The branch will be used to release 23.1. Until then, whenever you
> commit a fix that is intended for inclusion in 23.1, please check it
> into *both* the branch and the trunk.
Hopefully it's the last time we need this "commit to both" brain-damage.
Actually, maybe Miles still have his Arch gateway working so we could
automatically install the 23/1 patches into the trunk?
Stefan
^ permalink raw reply [flat|nested] 13+ messages in thread
end of thread, other threads:[~2009-06-24 21:15 UTC | newest]
Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-06-19 17:59 Branching Chong Yidong
2009-06-19 18:08 ` Branching Chong Yidong
2009-06-21 1:33 ` Branching Glenn Morris
2009-06-21 3:23 ` Branching Miles Bader
2009-06-21 5:06 ` Branching Chong Yidong
2009-06-21 6:45 ` Branching Nick Roberts
2009-06-21 14:36 ` Branching Chong Yidong
2009-06-21 15:43 ` Branching Michael Albinus
2009-06-21 18:59 ` Branching Chong Yidong
2009-06-22 2:25 ` Branching Glenn Morris
2009-06-22 7:02 ` Branching Yavor Doganov
2009-06-22 7:08 ` Branching Glenn Morris
2009-06-24 21:15 ` Branching Stefan Monnier
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.