From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Lars Ingebrigtsen Newsgroups: gmane.emacs.bugs Subject: bug#11975: 23.4; ediff-revision mix up Repository with Working revision (CVS) Date: Thu, 20 Aug 2020 16:00:32 +0200 Message-ID: <87o8n5v2m7.fsf@gnus.org> References: Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="6818"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (gnu/linux) Cc: 11975@debbugs.gnu.org To: Christian Brolin Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Aug 20 16:01:13 2020 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k8l7x-0001gF-KV for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 20 Aug 2020 16:01:13 +0200 Original-Received: from localhost ([::1]:52112 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1k8l7w-0000u5-J6 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 20 Aug 2020 10:01:12 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]:46044) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1k8l7m-0000to-2g for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2020 10:01:02 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]:59954) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1k8l7l-0006Jz-Oq for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2020 10:01:01 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1k8l7l-0002Wa-N6 for bug-gnu-emacs@gnu.org; Thu, 20 Aug 2020 10:01:01 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Lars Ingebrigtsen Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 20 Aug 2020 14:01:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 11975 X-GNU-PR-Package: emacs Original-Received: via spool by 11975-submit@debbugs.gnu.org id=B11975.15979320509046 (code B ref 11975); Thu, 20 Aug 2020 14:01:01 +0000 Original-Received: (at 11975) by debbugs.gnu.org; 20 Aug 2020 14:00:50 +0000 Original-Received: from localhost ([127.0.0.1]:43264 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8l7a-0002LW-Ba for submit@debbugs.gnu.org; Thu, 20 Aug 2020 10:00:50 -0400 Original-Received: from quimby.gnus.org ([95.216.78.240]:57940) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1k8l7Y-0002Ex-UB for 11975@debbugs.gnu.org; Thu, 20 Aug 2020 10:00:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnus.org; s=20200322; h=Content-Type:MIME-Version:Message-ID:In-Reply-To:Date: References:Subject:Cc:To:From:Sender:Reply-To:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=KLQDBeUhbJOpXesLDegKvBWdX+dOAhgs8KynY9G34F4=; b=qrSTOFfiknE8eFHL0fKU60s9r7 l0WS+p/69hDOx1Dub6g/RG6JQxNUVlnXrQOGFA6+FmiVsc6WqOexQergt+G/8qUc0XPswKoooy9EC ogBN5K1eG0pnxirOc4UFhKfSCjGKknY02kVx0sA8AvXixPekuIFA2G0BQ3EAYxzRzoeo=; Original-Received: from cm-84.212.202.86.getinternet.no ([84.212.202.86] helo=xo) by quimby with esmtpsa (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1k8l7J-0004CD-Kg; Thu, 20 Aug 2020 16:00:43 +0200 X-Now-Playing: Various's _SHAPE Platform 2019_: "JESSE - Memory Waves" In-Reply-To: (Christian Brolin's message of "Wed, 18 Jul 2012 11:21:05 +0200") X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list 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-mx.org@gnu.org Original-Sender: "bug-gnu-emacs" Xref: news.gmane.io gmane.emacs.bugs:185693 Archived-At: (I'm going through old bug reports that unfortunately got no response at the time.) Christian Brolin writes: > 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) Are you still seeing this problem in more recent versions of Emacs? I guess it's unlikely that you're still using cvs, though. :-/ -- (domestic pets only, the antidote for overdose, milk.) bloggy blog: http://lars.ingebrigtsen.no