Mail Archives: geda-user/2015/03/01/17:31:48
DJ Delorie wrote:
> It looks like, when you add a lot of directories all at once, it
> starts up that many "cvs update" and rsync commands, instead of
> batching them.
Ok. I made sure to commit only a few folders with a maximum of 50 files
at a time. This was a bit tedious but mostly successful. All files
committed fine except for one:
.../kaimartin_knaak/changelog.html
If I try to commit:
/-------------------
$ cvs commit
cvs commit: Examining .
cvs commit: Examining essential
cvs commit: Examining essential/footprints
(...snip...)
cvs commit: Examining symbols/templates
cvs commit: Examining symbols/titleblocks
Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs
Action: (continue)
cvs commit: file `changelog.html' had a conflict and has not been modified
cvs [commit aborted]: correct above errors first!
cvs commit: your log message was saved in /var/tmp/cvsB07rug
$
\-------------------
Same result if I actually change the file.
If I move the file out of the way, I get:
/-------------------
$ cvs commit
cvs commit: Examining .
cvs commit: warning: new-born changelog.html has disappeared
cvs commit: Examining essential
(...snip...)
cvs commit: Examining symbols/titleblocks
cvs commit: Up-to-date check failed for `changelog.html'
cvs [commit aborted]: correct above errors first!
cvs commit: your log message was saved in /var/tmp/cvsueAp2R
$
\-------------------
---<)kaimartin(>---
- Raw text -