GNU/Linux Desktop Survival Guide by Graham Williams
Desktop Survival Project Home Preface Advocacy History Distributions Installation Basic Survival Wajig Audio AbiWord APM Backup Bash Booting Cameras CD Chinese ChRoot Clock Commercial Conference Management Configuration CRON CVS Databases DIA Directories Disks Documentation DVD Email Eye of Gnome Evolution File Systems Firewalls Floppy Disks Fonts Ghemical GIMP Glade Gnome GnuCash Gnumeric GQView Graphics Groups HTML Editors ImageMagick Initialisations on Booting Java KDE Kernels Keyboard Konqueror KVM Switch LaTeX Log System Login Magellan Mathematics Memory Modems Mounting Devices MS/Windows Music MySQL Nautilus Networks NFS NT File System OpenOffice.org Oracle Packages Partitions Passwords PDF Photos PPP Presentations Printing Python R Remote Desktops Rsync Samba Scanning Science Security SH File System Sketch Spell SPlus Spruce SSH SUDO Subversion Swap Themes USB Video Virtualization Web Word X XML Sample Installations Troubleshooting Index

Updating Your Project Copy

You can edit the files you have checked out. It is useful to regularly ensure you are working on the latest copies by doing:

  cvs update

This will update your copy of the files from the archive. Any updates made to the archive by others will appear in your copy. If there are any conflicts you will be warned about them and will need to find and resolve them in the files updated. CVS will tell you of conflicts:

    Merging differences between 1.42 and 1.43 into main.py
    rcsmerge: warning: conflicts during merge
    cvs update: conflicts found in main.py

CVS will actually modify your file which ends up with both versions of the conflict:

    <<<<<<< main.py
    def detect_outlier(limit, score)
    =======
    def detect_outlier(maximum, score)
    >>>>>>> 1.43

Here I added a limit variable to the method whereas someone else added maximum. I need to choose one or the other.

To add any new directories that have been added to the repository to your local checked out copy, and to prune any directories that are empty from the local checked out copy, use:

  cvs update -dP