From: gg44060@mail.com
Subject: Re: Emacs RCS ci failed
Date: 24 Feb 2004 07:39:13 -0800 [thread overview]
Message-ID: <f461b4c0.0402240739.ce7ff71@posting.google.com> (raw)
In-Reply-To: m3broucn25.fsf@mika.informatik.uni-freiburg.de
LEE Sau Dan wrote in message news:<m3broucn25.fsf@mika.informatik.uni-freiburg.de>...
> >>>>> "gg44060" == gg44060 <gg44060@mail.com> writes:
>
> gg44060> Hello, I am using RCS with multiple branches. When I
> gg44060> make a change and try to checkin with C-x C-q, I get an
> gg44060> error "ci failed". With C-x v l I see that there are
> gg44060> multiple locks. How do I fix this?
>
> 'ci' can't guess which version you're trying to check in, because
> you're holding more than one locks on that file. Try C-u C-x C-q and
> see if Emacs prompts you to specify a version number to check in as.
>
>
> gg44060> I can choose a branch manually each time I checkin, but
> gg44060> that is quite tedious.
>
> Use the "rcs" command in a shell to remove the other locks you're
> holding. Something like "rcs -u1.2.3.4 filename". Read "man rcs".
> (Read also the info pages on vc. It may has support for this
> operation from within Emacs. Or there may be some Emacs variables
> with which you can specify the "default" branch to check into.)
This is what I ended up doing. I hear the version control code is
much better in Emacs 21, so I'll see how what works out. From what I
saw in the info manuals, there is no support for removing locks etc in
Emacs 20.7
Thanks for the help.
prev parent reply other threads:[~2004-02-24 15:39 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-23 14:19 Emacs RCS ci failed gg44060
2004-01-23 22:33 ` LEE Sau Dan
2004-02-24 15:39 ` gg44060 [this message]
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=f461b4c0.0402240739.ce7ff71@posting.google.com \
--to=gg44060@mail.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.