From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Stefan Monnier Newsgroups: gmane.emacs.devel Subject: Re: Merging emacs-23 into trunk Date: Wed, 10 Nov 2010 10:46:02 -0500 Message-ID: References: NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1289403982 3974 80.91.229.12 (10 Nov 2010 15:46:22 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 10 Nov 2010 15:46:22 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Wed Nov 10 16:46:17 2010 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([199.232.76.165]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1PGCsJ-0000gA-Nx for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 16:46:15 +0100 Original-Received: from localhost ([127.0.0.1]:48677 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGCsJ-0005xw-88 for ged-emacs-devel@m.gmane.org; Wed, 10 Nov 2010 10:46:15 -0500 Original-Received: from [140.186.70.92] (port=60550 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1PGCsB-0005wl-Lc for emacs-devel@gnu.org; Wed, 10 Nov 2010 10:46:08 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1PGCsA-0006Tx-Gx for emacs-devel@gnu.org; Wed, 10 Nov 2010 10:46:07 -0500 Original-Received: from ironport2-out.teksavvy.com ([206.248.154.183]:28398 helo=ironport2-out.pppoe.ca) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1PGCs8-0006Su-7D; Wed, 10 Nov 2010 10:46:04 -0500 X-IronPort-Anti-Spam-Filtered: true X-IronPort-Anti-Spam-Result: AgwKAI9M2kxMCpqE/2dsb2JhbAChNIEAcr18hUoEhFqNXg X-IronPort-AV: E=Sophos;i="4.59,178,1288584000"; d="scan'208";a="82115852" Original-Received: from 76-10-154-132.dsl.teksavvy.com (HELO ceviche.home) ([76.10.154.132]) by ironport2-out.pppoe.ca with ESMTP/TLS/ADH-AES256-SHA; 10 Nov 2010 10:46:03 -0500 Original-Received: by ceviche.home (Postfix, from userid 20848) id EDD55660DC; Wed, 10 Nov 2010 10:46:02 -0500 (EST) In-Reply-To: (Eli Zaretskii's message of "Wed, 10 Nov 2010 07:03:57 -0500") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:132512 Archived-At: >> It's [...] scaringly slow (to some extent because of bzr's braindead >> lack of support for merging into a tree that's not clean). > I wanted to suggest "merge --force", but I see that you already tried > that: >> ;; Stupidly, "bzr merge --force -r A..B" dos not maintain the >> ;; metadata properly except when the checkout is clean. > Do you mean that "bzr merge --force" merges the text, but not the > history? Yes: it does merge the history but only in the case where the local tree has no pending merges (in which case bzrmerge can just use "merge -r B") I.e. the result of doing bzr merge -r B is never the same as doing bzr merge -r A bzr merge --force -r A..B While I do expect the two to behave differently w.r.t conflicts (or in the case where A>B, say), I think the fact that the second does not register the revisions from A to B in the "pending merges" data seems like a bug to me. And the fact that bzr merge -r A bzr merge --force -r B applies the A changes twice is another bug. Basically, "bzr merge" completely ignores pending merges. As does "bzr diff" (and probably most/all other commands) BTW. Stefan