zsh-workers
 help / color / mirror / code / Atom feed
* zsh CVS repository messed up?
@ 2006-07-02 23:21 Bart Schaefer
  2006-07-02 23:29 ` Bart Schaefer
  0 siblings, 1 reply; 2+ messages in thread
From: Bart Schaefer @ 2006-07-02 23:21 UTC (permalink / raw)
  To: zsh-workers

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.


^ permalink raw reply	[flat|nested] 2+ messages in thread

* Re: zsh CVS repository messed up?
  2006-07-02 23:21 zsh CVS repository messed up? Bart Schaefer
@ 2006-07-02 23:29 ` Bart Schaefer
  0 siblings, 0 replies; 2+ messages in thread
From: Bart Schaefer @ 2006-07-02 23:29 UTC (permalink / raw)
  To: zsh-workers

Sorry, false alarm.  It was in fact some of the CVS/Entries files in my
sandbox that had become corrupted.


^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2006-07-02 23:30 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2006-07-02 23:21 zsh CVS repository messed up? Bart Schaefer
2006-07-02 23:29 ` Bart Schaefer

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).