[Top][All Lists]

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

Re: cvs log -rtag_at_base_of_branch::tag_on_branch fails

From: Derek Robert Price
Subject: Re: cvs log -rtag_at_base_of_branch::tag_on_branch fails
Date: Thu, 01 Aug 2002 17:14:57 -0400
User-agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.0.0) Gecko/20020606

Veda Larson Palmer wrote:

Hi Larry,

Thanks for your quick response.

As far as I can tell, both our client and server are at 1.11.2:

% cvs version
Concurrent Versions System (CVS) 1.11.2 (client/server)

I get the same behavior in both local and pserver mode.
On our pserver host,

% grep cvs /etc/inetd.conf
cvspserver stream tcp nowait acl /usr/bin/cvs cvs -f --allow-root=/pgrd/ljdev/cv
sroot pserver
% /usr/bin/cvs version
Concurrent Versions System (CVS) 1.11.2 (client/server)

Interestingly, the same revision pair works with cvs diff/rdiff -rv1_0 -rv1_1
(but the output of diff doesn't make very nice release notes ;).

Are you unable to reproduce this behavior in cvs log with your 1.11.2

First off, there is a major difference between the log and diff functionality here. Diff only needs to process two revisions - effectively, it's checking out rev1 and rev2 and then running the equivalent of the diff util that you'd run from the command line.

Now, when you supply two revisions to log, it is a little trickier to figure out what you want. In this case, I would say it is fairly obvious that you are asking for all the log messages from revisions along the trunk from rev1to the base of branch1 then all the revisions on branch1 up to and including rev2:


But, in this case, things aren't so obvious:

                    \                         \
                     \----branch1-----rev1     \------branch2-----rev2

Larry only recently made what he called a "first cut" at making log requests between a "revision and *any* ancestor":

2002-04-19  Larry Jones  <larry.jones@sdrc.com>

    * log.c (log_expand_revlist): First cut at code to allow logging
    between a revision and *any* ancestor, not just one explicitly on
    the same branch (e.g., from 1.1 to

But I wouldn't be suprised from Larry's phrasing that only case 1 above had been implemented nor would I be suprised that case 2 was not even meant to work. Do you know which case your log request fell into?



Email: derek@ximbiot.com
Public key available from www.keyserver.net - Key ID 5ECF1609
Fingerprint 511D DCD9 04CE 48A9 CC07  A421 BFBF 5CC2 56A6 AB0E

Get CVS support at http://ximbiot.com
I predict future happiness for Americans if they can prevent the government
from wasting the labors of the people under the pretense of taking care of
                        - Thomas Jefferson

reply via email to

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