From: Eli Zaretskii <eliz@gnu.org>
To: Kenichi Handa <handa@m17n.org>
Cc: schwab@linux-m68k.org, monnier@IRO.UMontreal.CA, emacs-devel@gnu.org
Subject: Re: Changes to emacs-23 branch and the trunk
Date: Tue, 31 Aug 2010 20:05:15 +0300 [thread overview]
Message-ID: <83hbiak910.fsf@gnu.org> (raw)
In-Reply-To: <tl71v9f2c1s.fsf@m17n.org>
> From: Kenichi Handa <handa@m17n.org>
> Date: Tue, 31 Aug 2010 21:37:19 +0900
> Cc: monnier@IRO.UMontreal.CA, emacs-devel@gnu.org
>
> In article <m38w3nkn6f.fsf@hase.home>, Andreas Schwab <schwab@linux-m68k.org> writes:
>
> > You are probably confusing merge with cherry-pick.
>
> Maybe. Then which part was wrong with the procedure given
> by Stefan, and what is the correct procedure?
>
> It seems that git has cherry-pick command but bzr doesn't
> (at least by that name).
You don't _want_ to cherry-pick in this case, because bzr does not
track cherry-picks in its history. So cherry-picking would create
potential merge conflicts when Stefan or Chong will later merge from
the release branch. Avoiding such conflicts was the motivation behind
the procedure suggested by Stefan.
next prev parent reply other threads:[~2010-08-31 17:05 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-30 8:20 Changes to emacs-23 branch and the trunk Kenichi Handa
2010-08-30 14:19 ` Chong Yidong
2010-08-30 20:20 ` Juanma Barranquero
2010-09-14 15:03 ` Juanma Barranquero
2010-09-16 22:33 ` Chong Yidong
2010-09-17 15:09 ` Juanma Barranquero
2010-08-30 16:03 ` Stefan Monnier
2010-08-31 1:54 ` Kenichi Handa
2010-08-31 8:43 ` Stefan Monnier
2010-08-31 11:44 ` Kenichi Handa
2010-08-31 11:59 ` Andreas Schwab
2010-08-31 12:37 ` Kenichi Handa
2010-08-31 17:05 ` Eli Zaretskii [this message]
2010-08-31 13:08 ` Stefan Monnier
2010-09-01 0:32 ` Kenichi Handa
2010-09-01 7:01 ` Stefan Monnier
2010-09-02 2:49 ` Kenichi Handa
2010-09-02 5:07 ` Eli Zaretskii
2010-09-02 5:33 ` Kenichi Handa
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=83hbiak910.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=handa@m17n.org \
--cc=monnier@IRO.UMontreal.CA \
--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 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).