From: Bart Schaefer <schaefer@brasslantern.com>
To: zsh-workers@sunsite.dk
Subject: zsh CVS repository messed up?
Date: Sun, 02 Jul 2006 16:21:47 -0700 [thread overview]
Message-ID: <060702162147.ZM27898@torch.brasslantern.com> (raw)
zsh% cvs up -rzsh-4_2-patches
cvs [update aborted]: missing expected branches in /cvsroot/zsh/zsh/Completion/Base/Utility/_combination,v
I removed that file and the update was then able to proceed, but I got a
lot of stuff like this:
C Completion/X/Command/.distfiles
RCS file: /cvsroot/zsh/zsh/Completion/X/Command/_acroread,v
retrieving revision 1.4
retrieving revision 1.4.2.1
Merging differences between 1.4 and 1.4.2.1 into _acroread
rcsmerge: warning: conflicts during merge
P Functions/Zftp/zfanon
cvs update: checksum failure after patch to Functions/Zftp/zfanon; will refetch
I've never seen these kinds of problems when updating an unmodified CVS
sandbox trunk <-> branch, before.
next reply other threads:[~2006-07-02 23:22 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-07-02 23:21 Bart Schaefer [this message]
2006-07-02 23:29 ` Bart Schaefer
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=060702162147.ZM27898@torch.brasslantern.com \
--to=schaefer@brasslantern.com \
--cc=zsh-workers@sunsite.dk \
/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 public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).