Is it possible to use a different diff program with CVS? I'd like to use something like meld to give me a side-by-side graphical view of the repository and my changes. It's out of my control to use a different CMS. What would be ideal is some undocumented command line argument that would work like this:
cvs diff -prog /usr/bin/meld foo.cc
This would give me a diff of my checked out, modified version of foo.cc with the repository version, but using the diff program meld.
I realize an undocumented command line argument is unlikely, so if you have to hack it together, that works for me.
For example, if you check out revision 1.6 of Makefile , edit the file, then run cvs diff -r 1.6 Makefile , diff displays the changes you made to Makefile since you checked it out. If you invoke cvs diff with two -r or -D options, CVS compares the two revisions against each other.
The diff command is used to compare different revisions of files. The default action is to compare your working files with the revisions they were based on, and report any differences that are found. If any file names are given, only those files are compared.
diff is a command-line utility that allows you to compare two files line by line. It can also compare the contents of directories. The diff command is most commonly used to create a patch containing the differences between one or more files that can be applied using the patch command.
diff stands for difference. This command is used to display the differences in the files by comparing the files line by line. Unlike its fellow members, cmp and comm, it tells us which lines in one file have is to be changed to make the two files identical.
I use tkcvs and tkdiff (not the lastest version either)
the cool thing is that tkcvs also supports subversion.
tkdiff works on the command line and takes cvs tags...
If you use WinCVS, you can setup a Diff application such as WinMerge in the preferences.
In WinCVS preferences, tab WinCVS, "External diff program"
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With