From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Christian Brolin Newsgroups: gmane.emacs.bugs Subject: bug#11975: 23.4; ediff-revision mix up Repository with Working revision (CVS) Date: Wed, 18 Jul 2012 11:21:05 +0200 Message-ID: NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii X-Trace: dough.gmane.org 1342625538 29903 80.91.229.3 (18 Jul 2012 15:32:18 GMT) X-Complaints-To: usenet@dough.gmane.org NNTP-Posting-Date: Wed, 18 Jul 2012 15:32:18 +0000 (UTC) To: 11975@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 18 17:32:15 2012 Return-path: Envelope-to: geb-bug-gnu-emacs@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 1SrWEY-0001pp-Cd for geb-bug-gnu-emacs@m.gmane.org; Wed, 18 Jul 2012 17:32:14 +0200 Original-Received: from localhost ([::1]:34418 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrWEX-0005Rv-Mv for geb-bug-gnu-emacs@m.gmane.org; Wed, 18 Jul 2012 11:32:13 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:51790) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrWEQ-0005Ll-Gv for bug-gnu-emacs@gnu.org; Wed, 18 Jul 2012 11:32:11 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrWEG-0007qp-IK for bug-gnu-emacs@gnu.org; Wed, 18 Jul 2012 11:32:06 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:39152) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrWEG-0007ql-EM for bug-gnu-emacs@gnu.org; Wed, 18 Jul 2012 11:31:56 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.72) (envelope-from ) id 1SrWKA-0007q0-GZ for bug-gnu-emacs@gnu.org; Wed, 18 Jul 2012 11:38:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Christian Brolin Original-Sender: debbugs-submit-bounces@debbugs.gnu.org Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 18 Jul 2012 15:38:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: report 11975 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: X-Debbugs-Original-To: bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.134262587030101 (code B ref -1); Wed, 18 Jul 2012 15:38:02 +0000 Original-Received: (at submit) by debbugs.gnu.org; 18 Jul 2012 15:37:50 +0000 Original-Received: from localhost ([127.0.0.1]:48696 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SrWJx-0007pQ-LN for submit@debbugs.gnu.org; Wed, 18 Jul 2012 11:37:50 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:43208) by debbugs.gnu.org with esmtp (Exim 4.72) (envelope-from ) id 1SrQXl-0002Oe-AZ for submit@debbugs.gnu.org; Wed, 18 Jul 2012 05:27:44 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrQRq-0004yx-IS for submit@debbugs.gnu.org; Wed, 18 Jul 2012 05:21:36 -0400 Original-Received: from lists.gnu.org ([208.118.235.17]:43544) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrQRq-0004yt-Ey for submit@debbugs.gnu.org; Wed, 18 Jul 2012 05:21:34 -0400 Original-Received: from eggs.gnu.org ([208.118.235.92]:45851) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrQRi-0005EE-Az for bug-gnu-emacs@gnu.org; Wed, 18 Jul 2012 05:21:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SrQRd-0004xJ-EE for bug-gnu-emacs@gnu.org; Wed, 18 Jul 2012 05:21:26 -0400 Original-Received: from gatekeeper.carmen.se ([193.12.210.250]:38440 helo=gulfport.carmen.se) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SrQRc-0004x2-W0 for bug-gnu-emacs@gnu.org; Wed, 18 Jul 2012 05:21:21 -0400 Original-Received: from pagopago.jeppesensystems.com (unknown [10.67.10.90]) by gulfport.carmen.se (Postfix) with ESMTP id 17D86C004 for ; Wed, 18 Jul 2012 11:21:06 +0200 (CEST) Original-Received: from bukoba.got.jeppesensystems.com (bukoba.got.jeppesensystems.com [10.67.7.140]) by pagopago.jeppesensystems.com (Postfix) with ESMTP id E8B7E1C000E for ; Wed, 18 Jul 2012 11:21:05 +0200 (CEST) Original-Received: from bukoba.got.jeppesensystems.com (localhost.localdomain [127.0.0.1]) by bukoba.got.jeppesensystems.com (8.14.4/8.14.4) with ESMTP id q6I9L5hO002996 for ; Wed, 18 Jul 2012 11:21:05 +0200 Original-Received: (from brolin@localhost) by bukoba.got.jeppesensystems.com (8.14.4/8.14.4/Submit) id q6I9L5aa002994; Wed, 18 Jul 2012 11:21:05 +0200 X-Authentication-Warning: bukoba.got.jeppesensystems.com: brolin set sender to brolin@jeppesensystems.com using -f X-Carmen_GOT-MailScanner-Information: Please contact IT/IS for more information X-Carmen_GOT-MailScanner: Found to be clean X-MailScanner-From: brolin@jeppesensystems.com X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.4-2.6 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Mailman-Approved-At: Wed, 18 Jul 2012 11:37:48 -0400 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.13 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 140.186.70.43 X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:62113 Archived-At: This bug report will be sent to the Free Software Foundation, not to your local site managers! Please write in English if possible, because the Emacs maintainers usually do not have translators to read other languages for them. Your report will be posted to the bug-gnu-emacs@gnu.org mailing list and the gnu.emacs.bug news group, and at http://debbugs.gnu.org. Please describe exactly what actions triggered the bug and the precise symptoms of the bug. If you can, give a recipe starting from `emacs -Q': When comparing local modifications with ediff-revision and the CVS Working revison is older than the Repository revision, ediff-revision (with default arguments) compares the current buffer with the Repository revison but names that buffer with the Working revision. In my case I checked out DynamicPage r1.27 and modified it locally. Another one check in changes to the same file so now the Repository revision is 1.28: > cvs stat DynamicPage.cc =================================================================== File: DynamicPage.cc Status: Needs Merge Working revision: 1.27 Wed Jun 27 06:32:36 2012 Repository revision: 1.28 [...]/DynamicPage.cc,v Sticky Tag: (none) Sticky Date: (none) Sticky Options: (none) The reference buffer is called DynamicPage.cc.~1.27~ but its contents are exactly what are in r1.28! It is confusing. I want ediff-revision to show only my local changes by default. If Emacs crashed, and you have the Emacs process in the gdb debugger, please include the output from the following gdb commands: `bt full' and `xbacktrace'. For information about debugging Emacs, please read the file /users/brolin/inst/emacs-23.4/etc/DEBUG. In GNU Emacs 23.4.1 (x86_64-unknown-linux-gnu, GTK+ Version 2.18.9) of 2012-05-21 on arawa Windowing system distributor `The X.Org Foundation', version 11.0.70101000 configured using `configure '--with-gif=no' '--with-tiff=no'' Important settings: value of $LC_ALL: nil value of $LC_COLLATE: nil value of $LC_CTYPE: nil value of $LC_MESSAGES: nil value of $LC_MONETARY: nil value of $LC_NUMERIC: nil value of $LC_TIME: nil value of $LANG: en_US value of $XMODIFIERS: nil locale-coding-system: iso-latin-1-unix default enable-multibyte-characters: t Major mode: C++/l Minor modes in effect: global-ede-mode: t ede-minor-mode: t show-paren-mode: t tooltip-mode: t mouse-wheel-mode: t tool-bar-mode: t menu-bar-mode: t file-name-shadow-mode: t global-font-lock-mode: t font-lock-mode: t blink-cursor-mode: t auto-encryption-mode: t auto-compression-mode: t column-number-mode: t line-number-mode: t transient-mark-mode: t abbrev-mode: t Recent input: n n n n n n n n n n n n n n n n n n n n n n n n n n n n p n n n n n n n n n n n n n n n n M-x C-g M-x r e p o r Recent messages: Computing differences between DynamicPage.cc.~1.27~ and DynamicPage.cc ... Buffer A: Processing difference region 0 of 5 Buffer B: Processing difference region 0 of 5 Processing difference regions ... done Region 1 in buffer A is empty [2 times] Refining difference region 2 ... Refining difference region 3 ... Region 4 in buffer A is empty [2 times] Quit Making completion list... Load-path shadows: -- Christian Brolin Email : Christian.Brolin@CarmenSystems.com CARMEN SYSTEMS AB Phone +46 31-720 81 61 Odinsgatan 9 Fax +46 31-720 81 20 S-411 03 Gothenburg, Sweden