From: Lars Ingebrigtsen <larsi@gnus.org>
To: Christian Brolin <brolin@jeppesensystems.com>
Cc: 11975@debbugs.gnu.org
Subject: bug#11975: 23.4; ediff-revision mix up Repository with Working revision (CVS)
Date: Thu, 20 Aug 2020 16:00:32 +0200 [thread overview]
Message-ID: <87o8n5v2m7.fsf@gnus.org> (raw)
In-Reply-To: <p6hat5fmri.fsf@bukoba.got.jeppesensystems.com> (Christian Brolin's message of "Wed, 18 Jul 2012 11:21:05 +0200")
(I'm going through old bug reports that unfortunately got no response at
the time.)
Christian Brolin <brolin@jeppesensystems.com> 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
next prev parent reply other threads:[~2020-08-20 14:00 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-18 9:21 bug#11975: 23.4; ediff-revision mix up Repository with Working revision (CVS) Christian Brolin
2020-08-20 14:00 ` Lars Ingebrigtsen [this message]
2020-11-24 8:46 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87o8n5v2m7.fsf@gnus.org \
--to=larsi@gnus.org \
--cc=11975@debbugs.gnu.org \
--cc=brolin@jeppesensystems.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.