{"id":120,"date":"2026-10-12T09:11:24","date_gmt":"2026-10-12T09:11:24","guid":{"rendered":"http:\/\/www.scmgalaxy.com\/tutorials\/2009\/02\/02\/how-cvs-will-help-to-realtime-developers-2\/"},"modified":"2026-10-12T09:11:24","modified_gmt":"2026-10-12T09:11:24","slug":"how-cvs-will-help-to-realtime-developers-2","status":"publish","type":"post","link":"https:\/\/www.devopsschool.com\/blog\/how-cvs-will-help-to-realtime-developers-2\/","title":{"rendered":"CVS Command-Line Guide: Logs, Diffs, Branches, Tags, and Safer Merges"},"content":{"rendered":"\n

Originally published on 2009-02-02; fully revised and updated.<\/em><\/p>\n\n\n\n

This guide is for engineers who still maintain code in CVS<\/strong> and need a reliable command-line playbook. It consolidates the original tips into a clearer workflow for inspecting changes, creating branches, tagging releases, and merging HEAD into long-lived branches with less risk.<\/p>\n\n\n\n

Core CVS commands for history and status<\/h2>\n\n\n\n

These commands are the daily basics for understanding what changed and what your working copy contains.<\/p>\n\n\n\n

Command<\/th>What it does<\/th>Typical use<\/th><\/tr><\/thead>
cvs log filename<\/td>Shows revision history and commit messages for one file<\/td>Find revision numbers and prior changes<\/td><\/tr>
cvs status filename<\/td>Shows working revision, repository revision, and sticky tags<\/td>Confirm branch\/tag context before merge or commit<\/td><\/tr>
cvs -q diff -u filename<\/td>Shows local changes against repository version<\/td>Review uncommitted edits<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n
cvs log filename\ncvs status filename\ncvs -q diff -u filename<\/code><\/span><\/pre>\n\n\n
Diff recipes for branches, revisions, and files<\/h2>\n\n\n\n
Use these patterns when you need to compare specific branches or revisions.<\/p>\n\n\n
# Diff two branches (entire working tree)<\/span>\ncvs -q diff -u -r BRANCH1 -r BRANCH2\n\n# Diff one file across two branches<\/span>\ncvs -q diff -u -r BRANCH1 -r BRANCH2 filename\n\n# Diff two explicit file revisions<\/span>\ncvs -q diff -u -r VERSION1 -r VERSION2 filename\n\n# Diff working copy vs a specific revision<\/span>\ncvs -q diff -u -r VERSION filename<\/code><\/span>Code language:<\/span> PHP<\/span> (<\/span>php<\/span>)<\/span><\/small><\/pre>\n\n\n
Retrieve specific revisions and switch branch context<\/h2>\n\n\n\n
When debugging or reproducing behavior, update a file or tree to a known revision or tag. Verify context with cvs status<\/strong>; CVS reports branch\/tag state as a sticky tag.<\/p>\n\n\n
# Update one file to a specific revision<\/span>\ncvs -q update -Pd -r REVISION filename\n\n# Move working copy to a specific tag or branch<\/span>\ncvs -q update -r TAG_VERSION\n\n# Verify sticky tag \/ branch state<\/span>\ncvs -q status<\/code><\/span>Code language:<\/span> PHP<\/span> (<\/span>php<\/span>)<\/span><\/small><\/pre>\n\n\n
Tagging releases and creating branches<\/h2>\n\n\n\n
Run tagging and branching from the project top-level directory so the whole module is consistently tagged.<\/p>\n\n\n\n
Operation<\/th>Command pattern<\/th>Why use it<\/th><\/tr><\/thead>
Release tag<\/td>cvs tag RELEASE_NAME<\/td>Create a reproducible release snapshot<\/td><\/tr>
Create branch<\/td>cvs tag -b BRANCH_NAME<\/td>Start isolated work for bugfixes or maintenance<\/td><\/tr>
Switch to branch<\/td>cvs -q update -r BRANCH_NAME<\/td>Put working copy on the intended branch<\/td><\/tr>
Branch checkpoint tag<\/td>cvs tag BRANCH_CHECKPOINT<\/td>Record a rollback\/reference point before merges<\/td><\/tr><\/tbody><\/table><\/figure>\n\n\n
# Optional: align to a known tag before branching<\/span>\ncvs -q update -r TAG_VERSION\n\n# Create branch from current context<\/span>\ncvs tag -b BRANCH_36_BUGFIX\n\n# Switch working copy onto that branch<\/span>\ncvs -q update -r BRANCH_36_BUGFIX\ncvs -q status\n\n# Tag a branch checkpoint<\/span>\ncvs tag BRANCH_36_BUGFIX_2026_10_12<\/code><\/span>Code language:<\/span> PHP<\/span> (<\/span>php<\/span>)<\/span><\/small><\/pre>\n\n\n
Workflow for merging HEAD into a branch safely<\/h2>\n\n\n\n
The original post emphasizes repeatable merges and tagging discipline. The flow below keeps a clear merge history and easier rollback points.<\/p>\n\n\n\n
\nflowchart TD\n    A[Update to target branch] --> B[Verify sticky tag with status]\n    B --> C[Create safety tag on branch]\n    C --> D[Create current HEAD tag]\n    D --> E[Merge into branch with update -j]\n    E --> F{Conflicts found}\n    F -- yes --> G[Resolve conflicts and review diff]\n    F -- no --> H[Review diff]\n    G --> I[Commit merge]\n    H --> I[Commit merge]\n    I --> J[Create post merge branch tag]\n<\/pre>\n\n\n\n
One-time merge from HEAD into a branch<\/h3>\n\n\n
cvs -q update -r BRANCH_36_BUGFIX\ncvs -q status\ncvs update -j HEAD\ncvs -q diff -u<\/code><\/span><\/pre>\n\n\n
Repeated merges using tags<\/h3>\n\n\n\n
For recurring merges, apply only the delta between two HEAD-side tags (old merge point to new merge point). The -kk<\/strong> option is commonly used to reduce keyword-expansion noise during merges.<\/p>\n\n\n
# Run from branch working copy<\/span>\ncvs update -kk -j UPDATE_HEAD_36_BUG_2026_01_15 -j UPDATE_HEAD_36_BUG_2026_02_01<\/code><\/span>Code language:<\/span> PHP<\/span> (<\/span>php<\/span>)<\/span><\/small><\/pre>\n\n\n
If prior merge tags were not created, teams sometimes use a build tag as the older join point and HEAD as the newer point.<\/p>\n\n\n
cvs update -kk -j DAILY_BUILD_2026_02_01 -j HEAD<\/code><\/span><\/pre>\n\n\n
Conflict handling and CLI quality-of-life tips<\/h2>\n\n\n\n
After a merge, capture conflicted files quickly and open them as a batch.<\/p>\n\n\n
cvs update -dP\ncvs update | grep '^C '<\/span> | sed -e 's\/^C \/\/'<\/span> > conflicted_files.txt\nvi $(cat conflicted_files.txt)<\/code><\/span>Code language:<\/span> JavaScript<\/span> (<\/span>javascript<\/span>)<\/span><\/small><\/pre>\n\n\n
The original post also suggests enabling compression for remote CVS traffic:<\/p>\n\n\n
alias cvs='cvs -z9'<\/span><\/code><\/span>Code language:<\/span> JavaScript<\/span> (<\/span>javascript<\/span>)<\/span><\/small><\/pre>\n\n\n
Best practices<\/h2>\n\n\n\n