From: Stefan Monnier <monnier@iro.umontreal.ca>
To: "Óscar Fuentes" <ofv@wanadoo.es>
Cc: emacs-devel@gnu.org
Subject: Re: Merging emacs-23 into trunk
Date: Fri, 12 Nov 2010 15:41:59 -0500 [thread overview]
Message-ID: <jwvwroil1hq.fsf-monnier+emacs@gnu.org> (raw)
In-Reply-To: <87iq02wkm4.fsf@telefonica.net> ("Óscar Fuentes"'s message of "Fri, 12 Nov 2010 17:51:47 +0100")
>>> Yes, when A (or its parent) already is on the target branch with the
>>> same revision-id as it has on the source branch.
>>
>> Which is exactly the situation I was talking about:
>>
>> And indeed
>> bzr merge -r A..B
>> will correctly track the history in the case where A has already been
>> merged and committed.
> "merge -r A..B" usually means a cherry-pick,
In the context of "where A has already been merged and committed", it's
not "usually" a cherry-pick: it's never a cherry-pick.
> because for the case when
> it is a merge there is no reason to specify A (the tool figures it out
> automatically) but it seems that you missed the syntax "merge -r B"
No, I didn't miss this syntax (as you can tell by looking at the
code I sent ;-).
Stefan
prev parent reply other threads:[~2010-11-12 20:41 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-09 21:30 Merging emacs-23 into trunk Stefan Monnier
2010-11-10 4:34 ` Glenn Morris
2010-11-10 5:44 ` Stephen J. Turnbull
2010-11-10 11:59 ` Eli Zaretskii
2010-11-11 2:28 ` Stephen J. Turnbull
2010-11-11 6:32 ` Eli Zaretskii
2010-11-11 8:39 ` Stephen J. Turnbull
2010-11-11 9:11 ` Eli Zaretskii
2010-11-11 12:29 ` Stephen J. Turnbull
2010-11-10 9:01 ` Andreas Schwab
2010-11-10 15:38 ` Stefan Monnier
2010-11-10 17:28 ` Glenn Morris
2010-11-10 20:42 ` Glenn Morris
2010-11-10 22:30 ` Chad Brown
2010-11-11 4:02 ` Eli Zaretskii
2010-11-11 5:09 ` Kenichi Handa
2010-11-11 19:55 ` Glenn Morris
2010-11-11 20:01 ` Lennart Borgman
2010-11-11 20:23 ` Óscar Fuentes
2010-11-11 20:49 ` Eli Zaretskii
2010-11-10 12:03 ` Eli Zaretskii
2010-11-10 15:46 ` Stefan Monnier
2010-11-10 17:21 ` Eli Zaretskii
2010-11-10 19:03 ` Stefan Monnier
2010-11-10 19:19 ` Eli Zaretskii
2010-11-10 19:36 ` Óscar Fuentes
2010-11-11 6:26 ` Eli Zaretskii
2010-11-11 17:13 ` Óscar Fuentes
2010-11-11 2:52 ` Stephen J. Turnbull
2010-11-11 6:38 ` Eli Zaretskii
2010-11-10 19:32 ` Óscar Fuentes
2010-11-11 19:57 ` Stefan Monnier
2010-11-11 20:20 ` Óscar Fuentes
[not found] ` <jwvd3qbo3z1.fsf-monnier+emacs@gnu.org>
2010-11-12 16:51 ` Óscar Fuentes
2010-11-12 20:41 ` Stefan Monnier [this message]
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=jwvwroil1hq.fsf-monnier+emacs@gnu.org \
--to=monnier@iro.umontreal.ca \
--cc=emacs-devel@gnu.org \
--cc=ofv@wanadoo.es \
/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.