aptitude upgrade problems

[John O Laoi <brianolaoi@gmail.com>]

>>
>> The following is my sources.list:
>> $ cat /etc/apt/sources.list
>> #
>> # deb cdrom:[Debian GNU/Linux 5.0.0 _Lenny_ - Official i386 NETINST
>> Binary-1 20090214-16:03]/ lenny main
>>
>> #deb cdrom:[Debian GNU/Linux 5.0.0 _Lenny_ - Official i386 NETINST
>> Binary-1 20090214-16:03]/ lenny main
>
> Why the mixed system?

Apologies, I am using Squeeze. The Lenny CDs are commented out.


>
> cvsnt conflicts with cvs.  You can't have both at the same time.
>

Should I remove one of them, and if so, which one?

Wolodja :
aptitude full-upgrade  appears that it will work.
Is it safe to proceed with?
I am not clear on the difference between  upgarde, safe-upgrade and
full-upgrade.

Thanks,
John