|
From: | R Bresner |
Subject: | -r HEAD bug? |
Date: | Mon, 14 May 2001 12:42:27 -0400 |
Howdy --
We've just installed cvs 1.11 from 1.9 and are
noticing a different behavior
with -r HEAD. (client NT, server
Solaris).
When diffing a branched area, CVS is getting the
head of a branch
based on the revision of a file. We have many files
that are branched,
but have no changes in the branched area, and so
still have a
mainline-esq revision number. The problem occurs
when we do a diff
with -rHEAD, as the file is diffed to _mainline_,
which is rarely as stable
as our branches.
For example.
>cvs status
tag_test
File: tag_test Status: Up-to-date Working
revision: 1.1
Repository revision: 1.1 /big2/cvs/master/olf/CONVERT/tag_test,v Sticky Tag: V51 (branch: 1.1.2) >cvs diff
tag_test
[no output]
>cvs diff -rV51
tag_test
[no output]
>cvs diff -rHEAD
tag_test
RCS file: /big2/cvs/master/olf/CONVERT/tag_test,v retrieving revision 1.2 retrieving revision 1.1 diff -r1.2 -r1.1 2d1 < New line >cvs diff -r1
tag_test
RCS file: /big2/cvs/master/olf/CONVERT/tag_test,v retrieving revision 1.2 retrieving revision 1.1 diff -r1.2 -r1.1 2d1 < New line See that? -rHEAD is evaluating to mainline,
based off of the 1.1
revision number, instead of, say, the 'magic branch
number' 1.1.2.
However, watch this: (connecting to cvs-1.9 on
Solaris)
>cvs-1.9.exe diff -rHEAD
tag_test
[no output] >cvs-1.9p2.exe diff -r1
tag_test
RCS file: /big2/cvs/master/olf/CONVERT/tag_test,v retrieving revision 1.2 retrieving revision 1.1 diff -r1.2 -r1.1 2d1 < New line That is the behavior we are used to. Is this
a bug, or is the new behavior of
-r HEAD to go to the mainline branch?
Thanks for any insight,
Rob
|
[Prev in Thread] | Current Thread | [Next in Thread] |