How Do I View Differences Across CVS Branches?

How Do I View Differences Across CVS Branches?
Prev	Chapter 4. Source Code	Next

Before merging changes in one CVS branch with another, it is often desirable to see what the differences are in the two versions of the file.

The following demonstrates how one views the differences between the file .xinitrc in the current directory as compared to the current version checked into the rh9 branch:

Figure 4.6. Comparing Source File To rh9 Branch

[root]# cvs diff -r rh9 .xinitrc
Index: .xinitrc
===================================================================
RCS file: /cvsroot/nst/src/packages/system/user-root/root/.xinitrc,v
retrieving revision 1.2
retrieving revision 1.3
diff -r1.2 -r1.3
6c6,8
< if [ -x /usr/X11R6/bin/vtwm ]; then
---
> if [ -x /usr/X11R6/bin/fluxbox ]; then
>   exec /usr/X11R6/bin/fluxbox
> elif [ -x /usr/X11R6/bin/vtwm ]; then
[root]#

The following demonstrates how one views the differences between the file .xinitrc in the current directory as compared to the current version checked into the HEAD (current development) branch:

Figure 4.7. Comparing Source File To HEAD (Current Development) Branch

[root]# cvs diff -r HEAD .xinitrc
Index: .xinitrc
===================================================================
RCS file: /cvsroot/nst/src/packages/system/user-root/root/.xinitrc,v
retrieving revision 1.3
retrieving revision 1.2
diff -r1.3 -r1.2
6,8c6
< if [ -x /usr/X11R6/bin/fluxbox ]; then
<   exec /usr/X11R6/bin/fluxbox
< elif [ -x /usr/X11R6/bin/vtwm ]; then
---
> if [ -x /usr/X11R6/bin/vtwm ]; then
[root]#

Prev	Up	Next
How Do I Merge Changes Across CVS Branches?	Home	How Do I Build The Network Security Toolkit ISO?