From: Stefan Monnier <monnier@iro.umontreal.ca>
To: Eli Zaretskii <eliz@gnu.org>
Cc: cyd@gnu.org, schwab@linux-m68k.org, emacs-devel@gnu.org
Subject: Re: Release branch plans
Date: Wed, 04 Apr 2012 13:41:59 -0400 [thread overview]
Message-ID: <jwvk41vo0t1.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <83ehs3ct46.fsf@gnu.org> (Eli Zaretskii's message of "Wed, 04 Apr 2012 20:19:21 +0300")
> Yes, you do, at least what _I_ am talking about. I explained this at
> least twice in the past: the history is all messed up on the trunk as
> result of this.
No, it's not messed up. Maybe you don't like it (not sure why), and
maybe `bzr log' shows it in a weird or messed up way (in which case you
should take it up with the bzr guys), but the history itself is very
much not messed up at all.
> You disagree with this being a problem, but I submit
> that this is akin to saying that the history is not important.
I care a lot about the VCS history metadata, which is why I insist that
we merge from the release branch onto the trunk.
> Maybe we should take a step back and ask ourselves why do we need to
> merge from the stable branch to the trunk at all?
Very simple: we want to make sure all the bug-fixes we install on the
stable branch don't get lost on the next release, and we want to reflect
this info into the VCS history so the VCS knows what's going on.
Stefan
next prev parent reply other threads:[~2012-04-04 17:41 UTC|newest]
Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-02 5:28 Emacs pretest 24.0.95 Chong Yidong
2012-04-02 5:38 ` Release branch plans Chong Yidong
2012-04-02 7:47 ` Glenn Morris
2012-04-02 8:08 ` Michael Albinus
2012-04-03 13:48 ` Michael Albinus
2012-04-05 12:57 ` GnuTLS docs (was: Release branch plans) Ted Zlatanov
2012-04-05 14:53 ` Eli Zaretskii
2012-04-05 17:12 ` GnuTLS docs Ted Zlatanov
2012-04-05 21:06 ` Eli Zaretskii
2012-04-05 22:32 ` Ted Zlatanov
2012-04-06 9:39 ` Eli Zaretskii
2012-04-09 1:37 ` Ted Zlatanov
2012-04-09 7:39 ` Eli Zaretskii
2012-04-09 12:25 ` Ted Zlatanov
2012-04-09 12:43 ` Eli Zaretskii
2012-04-09 13:12 ` Ted Zlatanov
2012-04-09 16:17 ` Glenn Morris
2012-04-09 16:19 ` Glenn Morris
2012-04-09 16:55 ` Ted Zlatanov
2012-04-09 17:05 ` Eli Zaretskii
2012-04-09 17:28 ` Glenn Morris
2012-04-09 18:41 ` Ted Zlatanov
2012-04-09 19:17 ` Glenn Morris
2012-04-09 19:59 ` Glenn Morris
2012-04-10 0:14 ` Ted Zlatanov
2012-04-13 0:04 ` Glenn Morris
2012-04-02 8:05 ` Release branch plans Michael Albinus
2012-04-02 8:16 ` Chong Yidong
2012-04-03 13:50 ` Michael Albinus
2012-04-04 15:36 ` Michael Albinus
2012-04-05 12:51 ` Ted Zlatanov
2012-04-05 20:18 ` auth.texi (was: Release branch plans) Michael Albinus
2012-04-05 21:23 ` Eli Zaretskii
2012-04-05 22:31 ` auth.texi Ted Zlatanov
2012-04-02 10:40 ` Release branch plans Andreas Schwab
2012-04-02 13:31 ` Chong Yidong
2012-04-02 13:40 ` Andreas Schwab
2012-04-02 13:14 ` Stefan Monnier
2012-04-03 10:53 ` Chong Yidong
2012-04-03 13:50 ` Stefan Monnier
2012-04-03 18:07 ` Eli Zaretskii
2012-04-02 17:05 ` Eli Zaretskii
2012-04-02 17:21 ` Andreas Schwab
2012-04-02 17:53 ` Eli Zaretskii
2012-04-02 18:43 ` Andreas Schwab
2012-04-02 18:58 ` Eli Zaretskii
2012-04-02 22:20 ` Glenn Morris
2012-04-02 22:43 ` Juanma Barranquero
2012-04-02 22:54 ` Andreas Schwab
2012-04-02 23:08 ` Juanma Barranquero
2012-04-02 22:44 ` Andreas Schwab
2012-04-03 1:12 ` Glenn Morris
2012-04-03 1:26 ` Glenn Morris
2012-04-03 10:00 ` Andreas Schwab
2012-04-03 18:09 ` Eli Zaretskii
2012-04-03 19:13 ` Stefan Monnier
2012-04-04 17:19 ` Eli Zaretskii
2012-04-04 17:41 ` Stefan Monnier [this message]
2012-04-04 19:03 ` Eli Zaretskii
2012-04-04 22:01 ` Stefan Monnier
2012-04-05 3:04 ` Eli Zaretskii
2012-04-05 13:17 ` Stefan Monnier
2012-04-05 14:58 ` Eli Zaretskii
2012-04-05 15:44 ` Stefan Monnier
2012-04-05 15:58 ` Eli Zaretskii
2012-04-05 15:02 ` Eli Zaretskii
2012-04-03 13:45 ` Stefan Monnier
2012-04-04 17:15 ` Eli Zaretskii
2012-04-02 20:16 ` Stefan Monnier
2012-04-07 2:37 ` Glenn Morris
2012-04-02 19:03 ` Emacs pretest 24.0.95 Glenn Morris
2012-04-02 20:20 ` Glenn Morris
2012-04-02 20:28 ` Tags in Emacs repository [was Re: Emacs pretest 24.0.95] Glenn Morris
2012-04-02 20:44 ` Tags in Emacs repository Glenn Morris
2012-04-02 20:47 ` Tags in Emacs repository [was Re: Emacs pretest 24.0.95] Andreas Schwab
2012-04-02 22:31 ` Tags in Emacs repository Glenn Morris
2012-04-03 13:56 ` Stefan Monnier
2012-04-03 20:04 ` Glenn Morris
2012-04-04 1:48 ` Glenn Morris
2012-04-04 1:59 ` Glenn Morris
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=jwvk41vo0t1.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=cyd@gnu.org \
--cc=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=schwab@linux-m68k.org \
/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 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.