info-cvs
[Top][All Lists]
Advanced

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

RE: branch tags


From: Matthew Herrmann
Subject: RE: branch tags
Date: Fri, 17 Aug 2001 10:00:32 +1000

Hi Derek,

Following your suggestion to look at logs to work out why I was getting
extra log messages, I did a file by file check.

I think I've uncovered a bizarre behaviour in cvs regarding newly created
files.

Here's the command I used.

cvs log -rROT_4_4_1_G:ROT_4_4_1_L

Here it works as expected:
============================================================================
=
RCS file:
\\gene\public\development\CVS/rotorgene/AllelicDiscrimination.frm,v
Working file: AllelicDiscrimination.frm
head: 1.8
branch:
locks: strict
access list:
symbolic names:
        ROT_4_4_1_L: 1.1.1.1.2.3
        ROT_4_4_1_K: 1.1.1.1.2.3
        ROT_4_4_1_I: 1.1.1.1.2.3
        ROT_4_4_1_H: 1.1.1.1.2.3
        ROT_4_4_1_MergePoint_2001_07_04: 1.1.1.1.2.3
        ROT_4_4_1_G: 1.1.1.1.2.3
        ROT_4_4_1_F: 1.1.1.1.2.2
        ROT_4_4_1_PATCHES: 1.1.1.1.0.2
        ROT_4_4_1: 1.1.1.1
        start: 1.1.1.1
        corbett: 1.1.1
keyword substitution: kv
total revisions: 12;    selected revisions: 1
description:
----------------------------
revision 1.1.1.1.2.3
date: 2001/07/02 08:44:16;  author: Matthew;  state: Exp;  lines: +6 -1
improved sample selector Show More/Show Less resizing
improved resizing code to remove magic numbers from frmMeltCurve and
frmQuantitate
sample selector now autoshrinks
============================================================================


This one hasn't yet had any tags since it's a new file on the dev branch.
Using the above cvs log command, I get every version instead of no versions
which i'd expect:
============================================================================
=

RCS file: \\gene\public\development\CVS/rotorgene/Analyses.frm,v
Working file: Analyses.frm
head: 1.2
branch:
locks: strict
access list:
symbolic names:
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.2
date: 2001/08/08 06:21:53;  author: Matthew;  state: Exp;  lines: +36 -54
Finished melt screen
----------------------------
revision 1.1
date: 2001/08/07 23:10:29;  author: Matthew;  state: Exp;
Convert software to MDI
Quantitation analysis fully functional
Melt half finished
Incomplete but more stable
============================================================================
=

Since I was compressing all identical messages at similar times to make a
changelog (like that perl script), I was getting ghost entries from newly
created entries on the main trunk in my "What's changed since the last
release" documents on the ROT_4_4_1_PATCHES trunk.

Is there any way of avoiding this before I get to my program? I'd rather not
have my log parser work out "well it's mostly branch-type tags so he
probably wanted this range so I'll ignore the main branch" style hacks.

Any suggestions appreciated.

Thanks,
Matthew Herrmann
Far Edge Technology


-----Original Message-----
From: dprice [mailto:dprice]On Behalf Of Derek R. Price
Sent: Saturday, 11 August 2001 05:39
To: Matthew Herrmann
Cc: CVS Mailing List
Subject: Re: branch tags


Matthew Herrmann wrote:

> The problem is that the branch version numbers are all :
> 1.1.1.1.1.4, 1.1.1.1.1.6 etc.
>
> instead of
> 1.1.1.4, 1.1.1.6, ...

Did you use import to create this project?  If you did, and no revisions
were
committed to the file before you created your branch, the branch numbers
would
all start 1.1.1.1...

It shouldn't be a problem, as far as I know.  If it really worries you, and
you
haven't committed any new revisions to the trunk yet, `cvs ci -f' in your
repository and recreate the branch.

Derek

--
Derek Price                      CVS Solutions Architect
 http://CVSHome.org )
mailto:address@hidden         CollabNet ( http://collab.net )
--
There's no hurry.  Tonight he'll be at Rick's.  Everybody comes to Rick's.

                - Claude Rains as Captain Louis Renault, _Casablanca_







reply via email to

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