From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Sven Joachim Newsgroups: gmane.emacs.devel Subject: Re: Confusing "bzr log" as result of merges Date: Sat, 21 May 2011 12:27:08 +0200 Message-ID: <87oc2wl56r.fsf@turtle.gmx.de> References: <83ipt4fqyy.fsf@gnu.org> <83fwo8fnnl.fsf@gnu.org> <8762p4mnqe.fsf@turtle.gmx.de> <83d3jcfm61.fsf@gnu.org> <87wrhkl7yi.fsf@turtle.gmx.de> <83aaegflk0.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1305973642 20976 80.91.229.12 (21 May 2011 10:27:22 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sat, 21 May 2011 10:27:22 +0000 (UTC) Cc: schwab@linux-m68k.org, emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sat May 21 12:27:17 2011 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([140.186.70.17]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1QNjOv-000269-61 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 12:27:17 +0200 Original-Received: from localhost ([::1]:35681 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjOu-0007WE-E6 for ged-emacs-devel@m.gmane.org; Sat, 21 May 2011 06:27:16 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:43048) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QNjOr-0007Vd-24 for emacs-devel@gnu.org; Sat, 21 May 2011 06:27:14 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QNjOp-0000xj-Qc for emacs-devel@gnu.org; Sat, 21 May 2011 06:27:13 -0400 Original-Received: from mailout-de.gmx.net ([213.165.64.22]:51967) by eggs.gnu.org with smtp (Exim 4.71) (envelope-from ) id 1QNjOp-0000xP-CS for emacs-devel@gnu.org; Sat, 21 May 2011 06:27:11 -0400 Original-Received: (qmail invoked by alias); 21 May 2011 10:27:10 -0000 Original-Received: from p4FF8927E.dip.t-dialin.net (EHLO turtle.gmx.de) [79.248.146.126] by mail.gmx.net (mp018) with SMTP; 21 May 2011 12:27:10 +0200 X-Authenticated: #28250155 X-Provags-ID: V01U2FsdGVkX19F9eZS9fdFBSkSbRJaOq96zg5KGXxS/H9YZxmQpM tmzwZOMIoT+FL2 Original-Received: by turtle.gmx.de (Postfix, from userid 1000) id 8980E3F5F4; Sat, 21 May 2011 12:27:09 +0200 (CEST) In-Reply-To: <83aaegflk0.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 12:30:07 +0300") User-Agent: Gnus/5.110017 (No Gnus v0.17) Emacs/23.3.50 (gnu/linux) X-Y-GMX-Trusted: 0 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 213.165.64.22 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:139581 Archived-At: On 2011-05-21 11:30 +0200, Eli Zaretskii wrote: >> From: Sven Joachim >> Cc: schwab@linux-m68k.org, emacs-devel@gnu.org >> Date: Sat, 21 May 2011 11:27:17 +0200 >> >> >> The downside of that is that bzr then does not track what revisions have >> >> already been merged. >> > >> > And that is downside because...? >> >> Because humans have to do the tracking then, without any help from the >> VCS. > > This revision was already on the trunk, so its other instance doesn't > need to be tracked. The VCS has to track them if you want to do proper merges (as opposed to cherry-picks aka merging only certain revisions). That it presents spurious logs for files that were not changed by the merge is a problem specific to bzr, as Andreas had pointed out. Cheers, Sven