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: Confusing "bzr log" as result of merges Date: Sun, 22 May 2011 11:14:40 -0300 Message-ID: References: <83ipt4fqyy.fsf@gnu.org> NNTP-Posting-Host: lo.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: dough.gmane.org 1306073693 32750 80.91.229.12 (22 May 2011 14:14:53 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Sun, 22 May 2011 14:14:53 +0000 (UTC) Cc: emacs-devel@gnu.org To: Eli Zaretskii Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Sun May 22 16:14:49 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 1QO9Qf-0006mW-2O for ged-emacs-devel@m.gmane.org; Sun, 22 May 2011 16:14:49 +0200 Original-Received: from localhost ([::1]:46386 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QO9Qe-0008LU-Il for ged-emacs-devel@m.gmane.org; Sun, 22 May 2011 10:14:48 -0400 Original-Received: from eggs.gnu.org ([140.186.70.92]:49775) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QO9Qc-0008LP-FM for emacs-devel@gnu.org; Sun, 22 May 2011 10:14:47 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QO9Qb-00086W-E4 for emacs-devel@gnu.org; Sun, 22 May 2011 10:14:46 -0400 Original-Received: from fencepost.gnu.org ([140.186.70.10]:60796) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QO9Qb-00086S-A4 for emacs-devel@gnu.org; Sun, 22 May 2011 10:14:45 -0400 Original-Received: from 213-159-126-200.fibertel.com.ar ([200.126.159.213]:55020 helo=ceviche.home) by fencepost.gnu.org with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QO9Qa-0007R2-NF; Sun, 22 May 2011 10:14:44 -0400 Original-Received: by ceviche.home (Postfix, from userid 20848) id D72B166371; Sun, 22 May 2011 11:14:40 -0300 (ART) In-Reply-To: <83ipt4fqyy.fsf@gnu.org> (Eli Zaretskii's message of "Sat, 21 May 2011 10:33:09 +0300") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.0.50 (gnu/linux) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 140.186.70.10 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:139623 Archived-At: > With the current trunk, type this command: > bzr log -l1 --line --include-merges src/xdisp.c > You will see this as output: > 104201: Glenn Morris 2011-05-12 [merge] Merge from emacs-23; up to r100577. > However, neither "bzr status" nor "bzr diff" will show any changes for > xdisp.c in that revision. The reason, it seems, is this: [...] > What can we do to avoid this confusion as result of merges? Easy: if it hurts, don't do it. The log command you used does not tell you "the latest revision that changed src/xdisp.c", so if you're looking for this latest revision, use something else, like bzr annotate. You can complain about the way we do current emacs-23 merges, but these aren't really special (even though we use a few hacks in bzrmerge.el, these are just to help resolve some of the conflicts that would arise from a plain "bzr merge"). The same kind of problems will show up with many other merges. The problem is not in the way those branches were handled or how the merge was done: the problem is that the request you use will not tell you quite what you're looking for (although it may occasionally do). Stefan