X-Authentication-Warning:	delorie.com: mail set sender to geda-user-bounces using -f
X-Recipient:	geda-user AT delorie DOT com
X-Injected-Via-Gmane:	http://gmane.org/
To:	geda-user AT delorie DOT com
From:	Kai-Martin Knaak <kmk AT familieknaak DOT de>
Subject:	Re: [geda-user] Restructure my section in gedasymbols.org
Date:	Sat, 06 Jul 2013 19:44:25 +0200
Lines:	55
Message-ID:	<kr9l1j$cnb$1@ger.gmane.org>
References:	<kr1tpj$6tn$1 AT ger DOT gmane DOT org> <201307031959 DOT r63Jxqko025951 AT envy DOT delorie DOT com> <kr452m$bvb$1 AT ger DOT gmane DOT org> <201307041931 DOT r64JVx4h020292 AT envy DOT delorie DOT com> <kr9c6l$s0d$1 AT ger DOT gmane DOT org>
Mime-Version:	1.0
X-Complaints-To:	usenet AT ger DOT gmane DOT org
X-Gmane-NNTP-Posting-Host:	a89-182-144-153.net-htp.de
User-Agent:	KNode/4.4.11
Reply-To:	geda-user AT delorie DOT com

Kai-Martin Knaak wrote:

> I am working on a fix right now...
> 
Unfortunately, I got stuck. 

If I try to sync the gedasymbols.org repository with my local files, 
I get errors:

/------------
$ cvs commit -m 'sync' footprints/generic/DIP/DIP12.fp
cvs commit: file `footprints/generic/DIP/DIP12.fp' had a conflict and has not been modified
\------------


If I use the -f flag to force a commit, there is no error message. But
subsequent commits still fail because of a "conflict":

/------------
$ cvs commit -f -m 'use force' footprints/generic/DIP/DIP12.fp
$ cvs commit footprints/generic/DIP/DIP12.fp
cvs commit: file `footprints/generic/DIP/DIP12.fp' had a conflict and has not been modified
cvs [commit aborted]: correct above errors first!
\------------

I tried to actually modify the file. Still the same error. 

I tried to move the local file out of the way and retrieve the server thinks
it conflicts with:

/------------
$ cvs checkout footprints/generic/DIP/DIP12.fp
cvs server: cannot find module `footprints/generic/DIP/DIP12.fp' - ignored
cvs [checkout aborted]: cannot expand modules
\------------

Apparently, the file is not on the server but an upload is denied because of
conflicts. Looking into CVS/Entries, I see lines like 
/DIP12.fp/0/dummy timestamp//

If I replace the dummy timestamp by some arbitrary date and try to cvs 
commit, I get:
cvs commit: Up-to-date check failed for `DIP12.fp'

If I remove the DIP12.fp line in CVS entries manually, I get:
$ cvs add DIP12.fp 
cvs add: DIP12.fp added independently by second party
(I wonder, how cvs knows about this) 

This affects all files I have added since my last regular cvs update. 
Anything I can do to get CVS commit working for these files?

---<)kaimartin(>---
-- 
Kai-Martin Knaak

- Raw text -