On 2010-03-23 10:32, Wolodja Wentland wrote: [snip]
Read the manpage - In a nutshell: upgrade Deprecated safe-upgrade Upgrade listed/all packages to newest version, don't remove packages
"don't remove packages"That's why OP is getting the failure. cvs and cvsnt conflict, but safe-upgrade won't remove either one of them, so fails nicely.
full-upgrade Do whatever actions it takes to upgrade packages to their latest version
-- "History does not long entrust the care of freedom to the weak or the timid." Dwight Eisenhower