Logo Questions Linux Laravel Mysql Ubuntu Git Menu
 

Use a different diff command with CVS?

Tags:

diff

meld

cvs

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.

like image 633
Scottie T Avatar asked Mar 10 '09 18:03

Scottie T


People also ask

How do you use cvs diff command?

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.

Which command is used to show the difference between two revisions?

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.

What is the use of diff command & What is the correct syntax?

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.

What does the diff command stand for?

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.


2 Answers

I use tkcvs and tkdiff (not the lastest version either)

  • http://www.twobarleycorns.net/tkcvs.html
  • http://tkdiff.sourceforge.net/
  • http://wiki.tcl.tk/3773

the cool thing is that tkcvs also supports subversion.

tkdiff works on the command line and takes cvs tags...

  • tkdiff -rfoo_v5_0 -rfoo_v6_5 silly.c (compare two different versions than the one in your local directory)
  • tkdiff spring.h (compare my local version to the repository)
  • tkdiff -r1.6 happy.c (compare my local version to a specific repository version)
like image 188
Sally Avatar answered Sep 29 '22 18:09

Sally


If you use WinCVS, you can setup a Diff application such as WinMerge in the preferences.

In WinCVS preferences, tab WinCVS, "External diff program"

like image 24
decasteljau Avatar answered Sep 29 '22 17:09

decasteljau