Hi Derek, I see what you mean about diff vs log, but my v1_0 is definitely an ancestor of v1_1 (case 1) - we defined branch1 to be rooted at v1_0. v1_0 is conceptually on the same branch as v1_1 - it's just at the base. This is analogous to the example in the manual:
http://www.cvshome.org/docs/manual/cvs_5.html#SEC54 cvs rtag -b -r v1_0 branch1 ... ------Trunk-----------v1_0------------------------- \ \---branch1-----v1_1-------v1_2 So, the command "cvs log -N -rv1_0::v1_1 ..." to get logs for changes between v1_0 and v1_1 should be well defined. I would think that anyone who uses branches for maintenance releases would want to do this to generate changelogs. Is this the way to do it or is there a better way? How do you guys generate changelogs? Thanks, -Veda -----Original Message----- Date: Thu, 01 Aug 2002 17:14:57 -0400 From: Derek Robert Price <[EMAIL PROTECTED]> To: Veda Larson Palmer [EMAIL PROTECTED] CC: [EMAIL PROTECTED] Subject: Re: cvs log -rtag_at_base_of_branch::tag_on_branch fails 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: ------Trunk------rev1------------------------- \ \---branch1-----rev2------- But, in this case, things aren't so obvious: -------Trunk-------------------------------------------- \ \ \----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 <[EMAIL PROTECTED]> > > * 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 4.1.2.3.6.1). 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? Derek -- *8^) Email: [EMAIL PROTECTED] 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 them. - Thomas Jefferson _______________________________________________ Bug-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/bug-cvs