[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

cvs diff -r queston

From: Mark Lancisi
Subject: cvs diff -r queston
Date: Thu, 17 Mar 2005 15:44:20 -0500

Hello - 

I've got a branch that was branched some months ago from the trunk of one of my 

I'd like to diff the head of this branch with the HEAD of the trunk.

So - while in the top level directory of a local checked out copy of the branch 
I run:

cvs diff -rHEAD

Problem is, this seems to only return differences between the base files for 
the branch and the HEAD of the trunk, rather than the head of the branch and 
HEAD of the trunk. 
 (Example: So if I have file x.c that is currently  version 1.4 on the trunk 
and on the branch, I'd expect the command I run run cvs -r1.4 -r1.2.2.7 
x.c against that file, but instead it runs cvs diff -r1.2 -r1.4 x.c)

One way around this, I've found,  is to use rdiff instead:

cvs rdiff -r<branchname> -rHEAD <projectname>

This does do the appropriate diffs, however I don't understand why simply 
running cvs diff -rHEAD doesn't do the same thing..

Thanks in advance for any help!

reply via email to

[Prev in Thread] Current Thread [Next in Thread]