From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.devel Subject: Re: [Emacs-diffs] trunk r117980: Merge from emacs-24; up to r117522. Date: Tue, 30 Sep 2014 19:53:02 +0300 Message-ID: <837g0lkq35.fsf@gnu.org> References: <23194.1412094213@olgas.newt.com> Reply-To: Eli Zaretskii NNTP-Posting-Host: plane.gmane.org X-Trace: ger.gmane.org 1412096017 14652 80.91.229.3 (30 Sep 2014 16:53:37 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Tue, 30 Sep 2014 16:53:37 +0000 (UTC) Cc: emacs-devel@gnu.org To: Bill Wohler Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Tue Sep 30 18:53:29 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XZ0g2-0003tR-Q1 for ged-emacs-devel@m.gmane.org; Tue, 30 Sep 2014 18:53:26 +0200 Original-Received: from localhost ([::1]:44420 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ0g2-0002mu-Dm for ged-emacs-devel@m.gmane.org; Tue, 30 Sep 2014 12:53:26 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:44053) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ0fv-0002mn-26 for emacs-devel@gnu.org; Tue, 30 Sep 2014 12:53:24 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XZ0fm-0000MA-4e for emacs-devel@gnu.org; Tue, 30 Sep 2014 12:53:18 -0400 Original-Received: from mtaout26.012.net.il ([80.179.55.182]:44184) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XZ0fl-0000Lu-Sr for emacs-devel@gnu.org; Tue, 30 Sep 2014 12:53:10 -0400 Original-Received: from conversion-daemon.mtaout26.012.net.il by mtaout26.012.net.il (HyperSendmail v2007.08) id <0NCQ00L003YSM900@mtaout26.012.net.il> for emacs-devel@gnu.org; Tue, 30 Sep 2014 19:51:15 +0300 (IDT) Original-Received: from HOME-C4E4A596F7 ([87.69.4.28]) by mtaout26.012.net.il (HyperSendmail v2007.08) with ESMTPA id <0NCQ00ETH45FYS60@mtaout26.012.net.il>; Tue, 30 Sep 2014 19:51:15 +0300 (IDT) In-reply-to: <23194.1412094213@olgas.newt.com> X-012-Sender: halo1@inter.net.il X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 80.179.55.182 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:174873 Archived-At: > From: Bill Wohler > 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").