Mail Archives: geda-user/2013/07/06/13:45:18
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 -