Adam Weeks wrote: [] > [localhost:~] aweeks% fink --version > Package manager version: 0.9.12 > Distribution version: <<<<<<< VERSION > 0.3.2a > ======= > 0.4.0.cvs > >>>>>>> 1.3
This shows that cvs unsuccessfully attempted to merge what it thinks are your private changes to the file "VERSION" with its own update. You have to throw it away. > When I run %fink selfupdate, > > [localhost:~] aweeks% fink selfupdate > sudo /sw/bin/fink selfupdate > Password: > > Your Fink installation is set up to update package descriptions directly from > CVS. Do you want to use this setup and update now? [Y/n] (Return) > > I will now run the cvs command to retrieve the latest package descriptions. > After that, the core packages will be updated right away; you should then > update the other packages using commands like 'fink update-all'. > > cvs -z3 update -d -P [] > cvs server: Updating . > C VERSION "C" means "conflict". You must erase all the files where there is a "C" at the beginning of the line, otherwise cvs will stop with errors. You probably also want to discard the files with an "M" at the beginning of the line, because this means that cvs successfully merges its changes with what it thinks are your private changes to the file. In any case, the resulting file is not identical to the one on the cvs server. > M dists/stable/crypto/finkinfo/egd-0.8-1.info [etc] What must have happened is that you once had a version from cvs, then changed a couple of files by installing them from a different source, and now you want to go back to the cvs version. cvs wants to control the entire history of the files, so it has difficulties with your situation. -- Martin ------------------------------------------------------- Sponsored by: ThinkGeek at http://www.ThinkGeek.com/ _______________________________________________ Fink-beginners mailing list [EMAIL PROTECTED] https://lists.sourceforge.net/lists/listinfo/fink-beginners
