all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Eli Zaretskii <eliz@gnu.org>
To: esr@thyrsus.com
Cc: monnier@iro.umontreal.ca, emacs-devel@gnu.org
Subject: Re: git transition issues
Date: Tue, 28 Oct 2014 20:01:10 +0200	[thread overview]
Message-ID: <8361f42hw9.fsf@gnu.org> (raw)
In-Reply-To: <20141028163655.GB10490@thyrsus.com>

Btw, all these changes are being committed to the trunk, but the
release branch doesn't have them.  However, if everything goes
according to plan, Emacs 24.5 is supposed to be made from the release
branch _after_ the transition to git.  So I think at least most, if
not all, of these changes need to be committed to the branch, and then
merged to the trunk as usual.  (For those changes that were already
committed to the trunk, they should be cherry-picked to the branch.)

I hope no one is entertaining the idea of having live bzr and git
repos in parallel, one for the release branch, the other for the
trunk.  Right?



  reply	other threads:[~2014-10-28 18:01 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-10-27  0:07 git transition issues Eric S. Raymond
2014-10-27  1:08 ` Stefan Monnier
2014-10-27  1:28   ` Eric S. Raymond
2014-10-27 13:10     ` Stefan Monnier
2014-10-28 15:35     ` Glenn Morris
2014-10-28 16:36       ` Eric S. Raymond
2014-10-28 18:01         ` Eli Zaretskii [this message]
2014-10-28 18:07           ` Eric S. Raymond
2014-10-28 18:19             ` Eli Zaretskii
2014-10-29  0:58               ` Stefan Monnier
2014-10-31  9:17                 ` Eli Zaretskii
2014-10-31 10:23                   ` Eric S. Raymond
2014-10-31 10:27                     ` Eli Zaretskii
2014-10-31 10:51                       ` Eric S. Raymond
2014-10-31 11:03                         ` Eli Zaretskii
2014-10-31 13:00                           ` Eric S. Raymond
2014-11-01  0:39                             ` Stephen J. Turnbull
2014-11-15 14:52   ` Rewriting bzrmerge.el (was: git transition issues) David Engster
2014-11-15 15:40     ` Rewriting bzrmerge.el Paul Eggert
2014-11-15 16:01       ` Stefan Monnier
2014-11-15 16:32       ` Eli Zaretskii
2014-11-15 16:04     ` Stefan Monnier
2014-11-15 16:10       ` David Engster
2014-11-15 16:26         ` David Engster
2014-11-16  3:50           ` Stefan Monnier
2014-11-21 22:47             ` David Engster
2014-11-22  8:16               ` Eli Zaretskii
2014-11-22 16:13                 ` David Engster
2014-11-22 16:42                   ` Eli Zaretskii
2014-11-22 17:17                     ` David Engster
2014-11-22 20:30                       ` Eli Zaretskii
2014-11-22 21:11                         ` David Engster
2014-11-23  3:35                           ` Eli Zaretskii
2014-11-23 16:32                           ` Steinar Bang
2014-11-23 17:49                             ` David Engster
2014-11-23 17:50                             ` Eli Zaretskii
2014-11-23 18:40                               ` Steinar Bang
2014-11-23 19:49                                 ` Eli Zaretskii
2014-11-22 22:28                         ` Stefan Monnier
2014-11-22 23:02                         ` Lars Magne Ingebrigtsen
2014-11-23  0:22                           ` Stephen J. Turnbull
2014-11-23  8:01                             ` David Kastrup
2014-11-23 16:08                               ` Eli Zaretskii
2014-11-23 16:29                                 ` Achim Gratz
2014-11-23 17:49                                   ` Eli Zaretskii
2014-11-23 16:29                                 ` David Kastrup
2014-11-23 16:42                                 ` Stephen J. Turnbull
2014-11-23 16:49                                   ` David Kastrup
2014-11-23 17:33                                   ` Eli Zaretskii
2014-11-23 16:41                               ` Steinar Bang
2014-11-23 14:22                             ` Lars Magne Ingebrigtsen
2014-11-23 15:08                               ` Ken Brown
2014-11-23 15:11                               ` Stephen J. Turnbull
2014-11-23 15:21                                 ` Lars Magne Ingebrigtsen
2014-11-24 15:11                                 ` Eli Zaretskii
2014-11-24 18:18                                   ` Stephen J. Turnbull
2014-11-24 18:26                                     ` Eli Zaretskii
2014-11-24 18:59                                       ` Stephen J. Turnbull
2014-11-24 19:06                                         ` Eli Zaretskii
2014-11-23  3:46                           ` Eli Zaretskii
2014-11-24  3:59                           ` Stefan Monnier
2014-11-24 13:09                             ` Eli Zaretskii
2014-11-22 15:57               ` Stefan Monnier
2014-11-23 17:18               ` David Engster
2014-11-15 16:26     ` Eli Zaretskii
2014-11-15 16:34       ` David Engster
2014-11-15 17:50         ` David Kastrup
2014-11-15 18:06           ` Eli Zaretskii
2014-11-15 18:20             ` David Kastrup
2014-11-15 20:02             ` David Engster
2014-10-27  1:42 ` git transition issues David Caldwell
2014-10-27  1:55   ` Eric S. Raymond
2014-10-28 15:33     ` Glenn Morris
2014-10-28 21:16   ` Randal L. Schwartz
2014-10-28 21:31     ` Randal L. Schwartz

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=8361f42hw9.fsf@gnu.org \
    --to=eliz@gnu.org \
    --cc=emacs-devel@gnu.org \
    --cc=esr@thyrsus.com \
    --cc=monnier@iro.umontreal.ca \
    /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.