From: Eli Zaretskii <eliz@gnu.org>
To: Stefan Monnier <monnier@iro.umontreal.ca>
Cc: emacs-devel@gnu.org
Subject: Re: Merging emacs-23 into trunk
Date: Wed, 10 Nov 2010 21:19:06 +0200 [thread overview]
Message-ID: <8362w5f0lx.fsf@gnu.org> (raw)
In-Reply-To: <jwvmxphovjd.fsf-monnier+emacs@gnu.org>
> From: Stefan Monnier <monnier@iro.umontreal.ca>
> Cc: emacs-devel@gnu.org
> Date: Wed, 10 Nov 2010 14:03:05 -0500
>
> > You are cherry-picking here; cherry-picking is explicitly not tracked
> > in the history DAG.
>
> Actually, I'm not cherry-picking
I think you are. From the docs of "bzr merge":
When merging a branch, by default the tip will be merged. To pick a
different revision, pass --revision. If you specify two values, the
first will be used as BASE and the second one as OTHER. Merging
individual revisions, or a subset of available revisions, like this is
commonly referred to as “cherrypicking”.
> Since all changes until A have been merged, merging A..B will end up
> with all changes until B: I'm not picking some changes and avoiding
> others. And indeed
>
> bzr merge -r A..B
>
> will correctly track the history in the case where A has already been
> merged and committed.
Maybe it's some exception, for when A is the BASE revision; the rule
(AFAIU) is what I quote above. When I use "merge -r", I don't expect
bzr to track the merge in the branch history.
Perhaps you need to ask about this on the Bazaar list.
> > Why is that a problem, in the context of this discussion (merging from
> > a release branch to the trunk)?
>
> Because, in order to cherry-pick, I merge the various parts of the
> emacs-23 branch differently, so I need to issue various "bzr merge"
> commands to merge the branch bit by bit.
I still don't understand the problem. Maybe it will become more clear
if you could show what you'd like to do, as opposed to what you need
to do, due to these limitations.
> >> And the fact that
> >> bzr merge -r A
> >> bzr merge --force -r B
> >> applies the A changes twice is another bug.
>
> > I think this is again because cherry-picking is not tracked, so bzr
> > doesn't "know" A is already there. In a nutshell, when you
> > cherry-pick, you need to do your own bookkeeping.
>
> Where do you see cherry-picking in the above commands: the -r argument
> always specifies just a revision on the branch, not a "A..B".
AFAIU, "-r A" is just a shorthand for "-r A..-1". If A is an
arbitrary revision on the branch being merged, you just cherry-pick
all the revisions from A to the branch tip.
next prev parent reply other threads:[~2010-11-10 19:19 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 [this message]
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
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=8362w5f0lx.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--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.