GNU bug report logs - #11975
23.4; ediff-revision mix up Repository with Working revision (CVS)

Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.

Package: emacs; Reported by: Christian Brolin <brolin@HIDDEN>; dated Wed, 18 Jul 2012 15:38:02 UTC; Maintainer for emacs is bug-gnu-emacs@HIDDEN.

Message received at submit <at> debbugs.gnu.org:


Received: (at submit) by debbugs.gnu.org; 18 Jul 2012 15:37:50 +0000
From debbugs-submit-bounces <at> debbugs.gnu.org Wed Jul 18 11:37:50 2012
Received: from localhost ([127.0.0.1]:48696 helo=debbugs.gnu.org)
	by debbugs.gnu.org with esmtp (Exim 4.72)
	(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
	id 1SrWJx-0007pQ-LN
	for submit <at> debbugs.gnu.org; Wed, 18 Jul 2012 11:37:50 -0400
Received: from eggs.gnu.org ([208.118.235.92]:43208)
	by debbugs.gnu.org with esmtp (Exim 4.72)
	(envelope-from <brolin@HIDDEN>) id 1SrQXl-0002Oe-AZ
	for submit <at> debbugs.gnu.org; Wed, 18 Jul 2012 05:27:44 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <brolin@HIDDEN>) id 1SrQRq-0004yx-IS
	for submit <at> debbugs.gnu.org; Wed, 18 Jul 2012 05:21:36 -0400
X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on eggs.gnu.org
X-Spam-Level: 
X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00,RCVD_IN_DNSWL_HI
	autolearn=unavailable version=3.3.2
Received: from lists.gnu.org ([208.118.235.17]:43544)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <brolin@HIDDEN>) id 1SrQRq-0004yt-Ey
	for submit <at> debbugs.gnu.org; Wed, 18 Jul 2012 05:21:34 -0400
Received: from eggs.gnu.org ([208.118.235.92]:45851)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <brolin@HIDDEN>) id 1SrQRi-0005EE-Az
	for bug-gnu-emacs@HIDDEN; Wed, 18 Jul 2012 05:21:34 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <brolin@HIDDEN>) id 1SrQRd-0004xJ-EE
	for bug-gnu-emacs@HIDDEN; Wed, 18 Jul 2012 05:21:26 -0400
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 <brolin@HIDDEN>) id 1SrQRc-0004x2-W0
	for bug-gnu-emacs@HIDDEN; Wed, 18 Jul 2012 05:21:21 -0400
Received: from pagopago.jeppesensystems.com (unknown [10.67.10.90])
	by gulfport.carmen.se (Postfix) with ESMTP id 17D86C004
	for <bug-gnu-emacs@HIDDEN>; Wed, 18 Jul 2012 11:21:06 +0200 (CEST)
Received: from bukoba.got.jeppesensystems.com (bukoba.got.jeppesensystems.com
	[10.67.7.140])
	by pagopago.jeppesensystems.com (Postfix) with ESMTP id E8B7E1C000E
	for <bug-gnu-emacs@HIDDEN>; Wed, 18 Jul 2012 11:21:05 +0200 (CEST)
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 <bug-gnu-emacs@HIDDEN>; Wed, 18 Jul 2012 11:21:05 +0200
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@HIDDEN using -f
From: Christian Brolin <brolin@HIDDEN>
To: bug-gnu-emacs@HIDDEN
Subject: 23.4; ediff-revision mix up Repository with Working revision (CVS)
Date: Wed, 18 Jul 2012 11:21:05 +0200
Message-ID: <p6hat5fmri.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
X-Carmen_GOT-MailScanner-Information: Please contact IT/IS for more information
X-Carmen_GOT-MailScanner: Found to be clean
X-MailScanner-From: brolin@HIDDEN
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-Received-From: 208.118.235.17
X-Spam-Score: -6.9 (------)
X-Debbugs-Envelope-To: submit
X-Mailman-Approved-At: Wed, 18 Jul 2012 11:37:48 -0400
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.13
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <http://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <http://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <http://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
	<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Sender: debbugs-submit-bounces <at> debbugs.gnu.org
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
X-Spam-Score: -6.9 (------)

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@HIDDEN 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:
<switch-frame> <help-echo> <switch-frame> <switch-frame> 
<help-echo> <switch-frame> <f11> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
<f11> <switch-frame> <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> <f11> <switch-frame> 
<switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> <f11> <switch-frame> 
<switch-frame> <switch-frame> <switch-frame> n <switch-frame> 
<switch-frame> <f11> <switch-frame> <switch-frame> 
<switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
<f11> <switch-frame> <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> <switch-frame> <switch-frame> 
<switch-frame> <help-echo> <down-mouse-4> <mouse-4> 
<double-down-mouse-4> <double-mouse-4> <triple-down-mouse-4> 
<triple-mouse-4> <down-mouse-4> <mouse-4> <double-down-mouse-4> 
<double-mouse-4> <triple-down-mouse-4> <triple-mouse-4> 
<triple-down-mouse-4> <triple-mouse-4> <down-mouse-4> 
<mouse-4> <double-down-mouse-4> <double-mouse-4> <triple-down-mouse-4> 
<triple-mouse-4> <triple-down-mouse-4> <triple-mouse-4> 
<triple-down-mouse-4> <triple-mouse-4> <down-mouse-5> 
<mouse-5> <double-down-mouse-5> <double-mouse-5> <triple-down-mouse-5> 
<triple-mouse-5> <triple-down-mouse-5> <triple-mouse-5> 
<triple-down-mouse-5> <triple-mouse-5> <down-mouse-4> 
<mouse-4> <double-down-mouse-4> <double-mouse-4> <triple-down-mouse-4> 
<triple-mouse-4> <triple-down-mouse-4> <triple-mouse-4> 
<down-mouse-5> <mouse-5> <double-down-mouse-5> <double-mouse-5> 
<triple-down-mouse-5> <triple-mouse-5> <triple-down-mouse-5> 
<triple-mouse-5> <triple-down-mouse-5> <triple-mouse-5> 
<triple-down-mouse-5> <triple-mouse-5> <help-echo> 
<switch-frame> n <switch-frame> <switch-frame> n <switch-frame> 
<switch-frame> <f11> <switch-frame> <switch-frame> 
<switch-frame> n <switch-frame> <switch-frame> n <switch-frame> 
<switch-frame> n <switch-frame> <switch-frame> p <switch-frame> 
<switch-frame> n <switch-frame> <switch-frame> <f11> 
<switch-frame> <switch-frame> <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
<switch-frame> <help-echo> <down-mouse-1> <mouse-1> 
<down-mouse-4> <mouse-4> <double-down-mouse-4> <double-mouse-4> 
<triple-down-mouse-4> <triple-mouse-4> <triple-down-mouse-4> 
<triple-mouse-4> <down-mouse-4> <mouse-4> <switch-frame> 
<switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
<f11> <switch-frame> <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> <f11> <switch-frame> 
<switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
<f11> <switch-frame> <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
n <switch-frame> <switch-frame> n <switch-frame> <switch-frame> 
<S-f11> <switch-frame> <switch-frame> <switch-frame> 
<switch-frame> <S-f11> <switch-frame> <switch-frame> 
<switch-frame> <S-f11> <switch-frame> <switch-frame> 
<switch-frame> n <switch-frame> <switch-frame> n <switch-frame> 
<switch-frame> n <switch-frame> <switch-frame> n <switch-frame> 
<switch-frame> <switch-frame> <down-mouse-1> <mouse-movement> 
<mouse-1> M-x <up> <return> C-g <help-echo> <help-echo> 
<help-echo> <help-echo> <help-echo> <down-mouse-1> 
<mouse-1> M-x r e p o <tab> r <tab> <tab> <return>

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@HIDDEN
CARMEN SYSTEMS AB  Phone +46 31-720 81 61
Odinsgatan 9       Fax   +46 31-720 81 20
S-411 03 Gothenburg, Sweden




Acknowledgement sent to Christian Brolin <brolin@HIDDEN>:
New bug report received and forwarded. Copy sent to bug-gnu-emacs@HIDDEN. Full text available.
Report forwarded to bug-gnu-emacs@HIDDEN:
bug#11975; Package emacs. Full text available.
Please note: This is a static page, with minimal formatting, updated once a day.
Click here to see this page with the latest information and nicer formatting.
Last modified: Fri, 31 Oct 2014 17:00:04 UTC

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997 nCipher Corporation Ltd, 1994-97 Ian Jackson.