info-cvs
[Top][All Lists]
Advanced

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

RE: Branching bug ??? (was Re: Bug is tagging the head of a branch head?


From: Christopher.Fouts
Subject: RE: Branching bug ??? (was Re: Bug is tagging the head of a branch head???)
Date: Wed, 19 May 2004 17:37:24 -0400

No, no, no, I'm NOT trying to "make" CVS work like ClearCase. I
perfectly
understand that it DOES not and CAN not.

It's just when I branch I want to see the "physical" branch, regardless
where it's coming from.

I just have a development philosophy I've used in the past that has
worked
for me. I treat the trunk as THE release branch, meaning only code that
has
been tested and verified is submitted to the trunk. So I create a
development
branch off the trunk and make this an "integration" branch. Individuals'
branches 
are off this development branch, where they do their own work, i.e.,
their 
sandboxes are checked out using their individual development branch, and
code
and "unit test" off their development branch. When all are ready, then
they
merge their code onto the the "integration" branch. Then the
"integration"
branch is tested, etc. Once proven the "integration" branch is merged
onto
the trunk, which is the release branch.

IOW, all tested code is funneled back to the trunk, which is the release

branch.

So what's a better way to do this?

-chris

-----Original Message-----
From: address@hidden [mailto:address@hidden 
Sent: Wednesday, May 19, 2004 5:14 PM
To: Fouts Christopher (); address@hidden
Subject: RE: Branching bug ??? (was Re: Bug is tagging the head of a
branch head???)


address@hidden writes:
>
> So to "physically," and not just conceptually accomplish
> what I want to do, I'll have to somehow make CVS "think" that I've
modified the files
> on my first branch "before" I make the second branch. I'll give this a
shot...

Why?  What purpose is served by making CVS create a revision that's
identical to another revision?  All you're doing is wasting time and
disk space.  Revision numbers are for CVS's internal use, you shouldn't
care about what they are.  (If you insist on doing it, though, you'll
find ``commit -f'' quite useful.)

> ...or think of another way to accomplish what I want to do, which is 
> to
have a 
> development branch, and then individuals' development branches off the
development
> branch.

That's what you've already got!  Perhaps you should explain exactly what
it is that you're trying to accomplish, then we can tell you how to do
it in CVS rather than you trying to make CVS work just like ClearCase.

-Larry

--------------------------------------------------------------------
mail2web - Check your email from the web at http://mail2web.com/ .






reply via email to

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