info-cvs
[Top][All Lists]
Advanced

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

Re: version numbering in CVS


From: Ted Stern
Subject: Re: version numbering in CVS
Date: Thu, 10 Apr 2008 15:10:59 -0700
User-agent: Gnus/5.110007 (No Gnus v0.7) Emacs/23.0.60 (gnu/linux)

On 10 Apr 2008 10:04:48 -0700, Eric Patty wrote:
>
> Let's say I have a file, call it "mathlib.cpp", belonging to a project called
> "Math_Prof" (incidentally, I have no idea if there is actually a product
> with such a name).  mathlib.cpp's current version on the trunk is 1.2.  I
> create a branch for the project, with the branch tag "Math_Grad", with of
> course "mathlib.cpp" being a file lin that branch.
> I have noticed that when I update to the new branch (in this example case,
> "Math_Grad"), the version number of the file is still 1.2.  However, when I
> commit on the trunk, the version is then 1.2.2.1.  Is there any way I can
> get 1.2.1.1?  Also, when I'm at 1.2.2.2 or whatever other "1.2.2.x" version,
> how do I bump up to, say, 1.2.3.1?

Hi Eric,

As I mentioned in private email, one option is to force a no-change
commit on the branch immediately after creating a branch:

    cvs rtag -b branchname projectname

    cvs co -d projectname-branchname projectname

    cd projectname-branchname

    cvs commit -f

If the trunk's version of the file is 1.2, then the initial branch
checkout (visible via 'cvs stat -v') is at 1.2 even though technically
the branch's version is implicitly 1.2.1.1.

Once you force the commit, you bumped up the branch version to
1.2.1.2, even though there are no changes.

This policy wastes one increment of the version number, but, if
followed consistently, has the advantage that all branch files have
checkout version numbers at the same level.

Ted
-- 
 dodecatheon at gmail dot com
 Frango ut patefaciam -- I break so that I may reveal




reply via email to

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