RE: first change on a branch causes no change to show up in -rTAGA::TAGB

[Matthew Herrmann]

Hi All,

I have taken Larry's suggestion and installed the latest dev version and it
is better, but still not 100%.

Here is the problem I found on development version of CVS:

For a file, FILE1:

Tags:
============================================================================
=====
TAG2: 1.3.2.1
TAG1: 1.3
TAG2_BRANCH: 1.3.2.1.0.2

Revisions:
============================================================================
=====
revision 1.3
date: 2001/12/16 23:13:12;  author: matthew;  state: Exp;  lines: +1 -1
branches:  1.3.2;
...
----------------------------------------------------------------------------
-----
revision 1.3.2.1
date: 2002/10/17 23:36:14;  author: matthew;  state: Exp;  lines: +1 -1
...
----------------------------------------------------------------------------
----=

the revision 1.3.2.1.0.2 doesn't exist, i'm guessing because it is a magic
branch tag. anyway, that seemed a little weird to me because all my other
tags, even
branch tags are always on a physical tag (or so I thought).

doing:

cvs log -rTAG1::TAG2 should produce log info for 1.3.2.1, but it produces
info
for 1.3 instead.

The interesting thing is that 1.3.2.1 is the start of another
branch which was a branch off our production branch for a minor bug-fix. So
I think this is the case that is not handled.

I have got some other extraneous changes but I think they are very likely
due to
this same problem.

cheers,
matt

Matthew Herrmann wrote:
>
> Hi All,
>
> I'm using cvs2cl to generate version differences on branches, but I'm
having
> trouble with picking up changes where no change was previously there. I
> think the problem is one in cvs log, though, not cvs2cl.
>
> Here's the command I use
>
> cvs2cl -w -f ChangeLog_%1_To_%2.txt -r%1::%2
>
> the scenario that breaks it is:
>
> working on branch BRANCH1
>
> at TAG1, on BRANCH1 : file is on 1.23
> at TAG2, on BRANCH1 file is on 1.23.1.4 after changes
>
> the problem is that even when looking at 2 tags on the same branch, it is
> only after the first change to the file that it becomes _really_ on the
> branch, before that, the tag is still officially on the trunk.
>
> What would fix this for me is for 1.23 => 1.23.x.y to be considered on the
> same line. At the moment the line is only being start just after 1.23
which
> means I'm losing a significant number of changes out of these history
logs.
>
> are there any patches available for this problem? some others must have
had
> this problem with log -r.
>
> cheers,
> matt
I assume you are speaking of either
http://search.cpan.org/author/FLUFFY/CVSUtils-1.00/
or http://www.red-bean.com/cvs2cl/

the '-r' option to cvs2cl is for:
[-r, --revisions              Show revision numbers in output]

what I think you want is to pass options to cvs log so you should use -l
"options":
[-l OPTS, --log-opts OPTS     Invoke like this "cvs ... log OPTS"]

if you want to pass revisions to cvs log I believe it should be something
like

cvs2cl -l "-r%1::%2" -w -f ChangeLog_%1_To_%2.txt

I use the global compress option as
cvs2cl.pl -g "-z9" -r -t -f cl.txt
so I think the line I gave you above will work, if cvs log will accept
whatever
"-r%1::%2" evaluates to.

--
I'd crawl over an acre of 'Visual This++' and 'Integrated Development
That' to get to gcc, Emacs, and gdb.  Thank you.
        -- Vance Petree, Virginia Power