routine tasks

CVS vs. Subversion Comment
Diff CVS cvs diff -u [-r tag1 -rtag2] [file] Print a unified diff of the changes in the current working directory against the last checkout/update.
Subversion svn diff [-r rev1:rev2] [file]
Commit CVS cvs commit Commit changes to the repository.
Subversion svn commit
Update CVS cvs update Merge changes from the repository.
In case of conflicts the conflicts are marked in the files as done in CVS. Additionally three files are generated:

  • file.mine: your version before the update command
  • file.oldrev: the version you've got from the repository
  • file.newrev: the current HEAD in the repository
Subversion svn update
Resolve conflicts CVS vi file Tell Subversion that an update conflict is solved.
This command removes the 3 additional files being created during the update conflict and allows you to commit the files.
CVS just looks that the file was touched after it found the conflict.
Subversion vi file
svn resolved file
Revert changes CVS rm file
cvs update file
Revert your changes to a file.
Subversion svn revert file
Move/Rename CVS mv old new
cvs remove old
cvs add new
cvs commit old new
Subversion svn move old new
Copy CVS cp old new
cvs add new
cvs commit new
Subversion svn copy old new
Add CVS cvs add file
Subversion svn add file
Remove CVS rm file
cvs remove file
Subversion svn remove file

Version History

CVS vs. Subversion Comment
Current Status CVS cvs status [file] Shows the information about the current status of a file.
Subversion svn info [file]
Commit Log CVS cvs log [file] Shows the history of all commits.
Note: Subversion requires you to run svn update to see the last commit in the log history.
Subversion svn log [file]