From: Eli Zaretskii <eliz@gnu.org>
To: Bill Wohler <wohler@newt.com>
Cc: emacs-devel@gnu.org
Subject: Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522.
Date: Tue, 30 Sep 2014 19:53:02 +0300 [thread overview]
Message-ID: <837g0lkq35.fsf@gnu.org> (raw)
In-Reply-To: <23194.1412094213@olgas.newt.com>
> From: Bill Wohler <wohler@newt.com>
> Date: Tue, 30 Sep 2014 09:23:33 -0700
> Cc: emacs-devel@gnu.org
>
> I did use bzr merge, but I added the -i flag to avoid pulling in other
> people's changes.
>
> $ bzr merge -i ../emacs-24/
> $ bzr ci -m"Merge from emacs-24; up to r117522."
>
> The man page for bzr merge -i says this:
>
> To select only some changes to merge, use "merge -i", which will
> prompt you to apply each diff hunk and file change, similar to
> "shelve".
>
> I had no indication that this would not include the merge information.
Whenever you merge only some of the commits, you are actually
cherry-picking. And cherry-picking is not tracked in the history DAG
of the VCS, at least not in bzr (and not in git, either).
You should merge without the -i switch, and without manually selecting
revisions to merge. Then the meta-data will record all the revisions
you merged. As Stefan says, using "M-x bzrmerge" is an easy way of
doing TRT in these situations (it will also pay attention to revisions
that were marked as "don't merge to trunk").
next prev parent reply other threads:[~2014-09-30 16:53 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <E1XYpeB-0002D6-5f@vcs.savannah.gnu.org>
2014-09-30 15:56 ` [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522 Stefan Monnier
2014-09-30 16:23 ` Bill Wohler
2014-09-30 16:53 ` Eli Zaretskii [this message]
2014-09-30 18:04 ` Stefan Monnier
2014-10-01 2:52 ` Stephen J. Turnbull
2014-10-01 14:44 ` Eli Zaretskii
2014-10-01 15:22 ` Yuri Khan
2014-10-01 15:45 ` Eli Zaretskii
2014-10-01 15:49 ` Eli Zaretskii
2014-10-02 1:48 ` Stephen J. Turnbull
2014-10-01 17:44 ` 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
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=837g0lkq35.fsf@gnu.org \
--to=eliz@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=wohler@newt.com \
/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).