[Top][All Lists]

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

Re: am I misunderstanding what HEAD refers to?

From: Dennis Jones
Subject: Re: am I misunderstanding what HEAD refers to?
Date: Fri, 05 Oct 2007 18:04:38 GMT

"Ted Stern" <address@hidden> wrote in message 

> At this point, I want to check to make sure no changes have gone into
> the trunk between BRANCHNAME_MERGE_HEAD and right now.
> So my first naive thought is to do a diff.  Note that I'm currently
> sitting in my branchname sandbox:
>    cvs diff -r BRANCHNAME_MERGE_HEAD -r HEAD 1>stdout 2>stderr

I'm not sure why nobody eslse has suggested this, but since 
BRANCHNAME_MERGE_HEAD always refers to a point on the trunk and you want to 
diff the trunk, why not go to the trunk and do the diff from there?  IOW, 
instead of sitting on your branch and trying to do the diff from there, just 
switch over to the trunk and do it.  That way, HEAD will refer to the trunk 
instead of the branch, and your diff should work as expected.

Am I missing something?

- Dennis 

reply via email to

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