[Project_owners] CVS problem

Nicolas Moreau n.mo at free.fr
Fri Aug 6 20:46:36 EDT 2004


Asaf Romano wrote:
> to make it simple:
> 1. download  (from the web interface) "good version" and save it
> (overwrite) the version in www/
> 2. in www/ do:
> cvs commit -m "some comment here" index.html

This doesnt work,

seems i have some conflicts and dead stuff, i'm a bit lost ...

[nicolas at localhost www]$ cvs commit index.html

Log message unchanged or not specified
a)bort, c)ontinue, e)dit, !)reuse this message unchanged for remaining dirs
Action: (continue) c
Checking in index.html;
/cvs/jetablemail/www/index.html,v  <--  index.html
new revision: 1.24; previous revision: 1.23
done
Processing log script arguments...
cvs diff: Tag 1.23 refers to a dead (removed) revision in file `index.html'.
cvs diff: No comparison available.  Pass `-N' to `cvs diff'?
Hovercraft is now updating: jetablemail/www
RCS file: /cvs/jetablemail/www/index.html,v
retrieving revision 1.22
retrieving revision 1.24
Merging differences between 1.22 and 1.24 into index.html
rcsmerge: warning: conflicts during merge
RCS file: /cvs/jetablemail/www/index.html,v
retrieving revision 1.22
retrieving revision 1.24
Merging differences between 1.22 and 1.24 into index.html
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in index.html
C index.html
cvs update: conflicts found in index.html
C index.html
? error
? protected
? error
? protected
[nicolas at localhost www]$


-- 
Nicolas Moreau


More information about the Project_owners mailing list