[Top][All Lists]

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

Re: branch removal question

From: Todd Denniston
Subject: Re: branch removal question
Date: Wed, 23 Jun 2004 09:03:24 -0500

> Don Butts wrote:
>     Content-Type: multipart/mixed; boundary="===============1243246784=="
Please do not send MIME and/or HTML encrypted messages to the list.
Plain text only, PLEASE!

> We are using cvs in somewhat of a non-standard way.
> We have a production cut of our compiled source that
> we deploy via cvs using a production branch.  The
> application does not mind the fact the CVS control
> files co-exist within the source and the application
> runs fine. When we want to patch production we first
> patch the same branch in a different checkout area and
> then commit it.  
Confused, one or 2 CVSROOTs? do you mean `patch < patchfile` or `cvs update
-jsomething -jsomethingelse` (generally called a merge)

> When it comes time to upgrade the
> production area we bring down the application during a
> maintenance window and perform a cvs update in the
> production area.  This has worked great for more than a
> year so I am very happy with this process.  We were
> basically mimicking this process in a pre-production area
> for QA purposes and while this has worked OK we are
> having a bit of trouble keeping these two branches in
> sync.  So,  I know that I can remove a branch via the
> cvs admin -n command and I am wondering if a better
> process would be to remove the preprod branch every time
Why remove it? You loose history when you remove things (actually delete
information from repo files), which is pretty much against having a version
control system in the first place.

why not create preprod`date +%Y_%b_%d` branches when you want to go into QA,
so you have all the information that lead up to each release.

(next question is a more personal process, not general practice) and why are
the production releases not just (normal) tags on the QA branch(es), where the
QA people have said "this set of files is correct for release."? Of course you
_might_ want to branch at that normal tag too if you need to do several fixes
to the released version and then merge back to that QA branch when the fixes
are ready to be QAed.

> I move a new patch to production and when it comes time
> to test the next patch just recreate the preprod branch
> off of the current prod branch. I have performed some
> tests using this method and all seems to work fine but
> I thought that I would ask the opinion of those who have
> been using CVS a lot longer than I.
>         Thank you for your time,
>                 Don Butts

Todd Denniston
Crane Division, Naval Surface Warfare Center (NSWC Crane) 
Harnessing the Power of Technology for the Warfighter

reply via email to

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