Does CVS has a easy way to compare file with its previous version?

Hi,All,

     I am wondering if cvs has an easy way to compare a file with its
previous version.

     In clearcase,I can use  :
       cleartool diff -pred file.cc

     how can I acheive it in CVS?
     any help would be highly appreciated!

     Thanks,
     dt

dtletmn wrote:

Why you're posting this to the git mailing list I have no idea, but assuming you mean "how do I compare a file in git with the content it had in the previous snapshot?", the answer would be:

  git diff HEAD^ -- path/to/file

This command works equally well on directories or multiple paths. Note that if there are no differences, the program will just exit silently.

If you want to see the differences compared to the *latest* commit, you'd do

  git diff HEAD -- path/to/file

If you want to see the differences compared to what you've staged for committing next, you'd do

  git diff -- path/to/file

If you want to see the differences between what you've already staged and the latest snapshot, you'd do

  git diff --staged -- path/to/file

dtletmn <dtletmedn@gmail.com> writes:

In CVS or in Git?

In CVS: "cvs diff -r <previous revision> <file>". In Git: "git diff HEAD^ -- <file>".

Both assume that you want to compare with version from previous commit.

On 06/30/2009 02:36 PM, Jakub Narebski wrote:

I think he wants something more like

git diff `git log -2 --pretty=format:%h` <file> -- <file>

In CVS it should not be hard, but I definitely have no idea.

Paolo

On Wed, 1 Jul 2009, Paolo Bonzini wrote:

That's a rather difficult way of saying

	git log --no-merges -p -1 <filename>

which seems much simpler. Sure, you'll get the commit message too, but that just sounds like gravy to me (you can use "--pretty=oneline" or something to make it denser).

			Linus

Linus Torvalds <torvalds <at> linux-foundation.org> writes:

Isn't the first one incorrect because <file> needs to be inside the backticks? git diff `git log -2 --pretty=format:%h <file>` -- <file>

And isn't the replacement incorrect also (the diffs are backwards)? git log --no-merges -p -R -1 <file>

- Eric

On 07/02/2009 08:04 PM, Eric Raible wrote:

Yes and no.

Paolo

On Thu, Jul 2, 2009 at 11:39 PM, Paolo Bonzini<bonzini@gnu.org> wrote:

Are you sure that you didn't mean yes and yes?

As the transcript shows the git-diff form produces a backwards diff. Thus to get the same output git-log needs the -R:

$ git init
$ perl -e 'for (0..10) { print "$_\n" }' > file
$ git add file
$ git commit -minitial
[master (root-commit) 2d451ec] initial
 1 files changed, 11 insertions(+), 0 deletions(-)
 create mode 100644 file
$ sed -e 's/4/four/' < file > file1
$ mv file1 file
$ git commit -a -m'updated'
[master d49613a] updated
 1 files changed, 1 insertions(+), 1 deletions(-)
$ git diff `git log -2 --pretty=format:%h file` -- file

On 07/07/2009 01:39 AM, Eric Raible wrote:

I'm sure; I'm not sure I was right (though I did retest at the time, and I was convinced that Linus's alternative worked).

Paolo

Thanks all very much for the help!!