[cvsnt] Re: CVS Use case

Glen Starrett grstarrett at cox.net
Mon Apr 25 21:23:41 BST 2005


Community technical support mailing list was retired 2010 and replaced with a professional technical support team. For assistance please contact: Pre-sales Technical support via email to sales@march-hare.com.


Matt Schuckmann wrote:
>  I was just trying to be open to various solutions, from what your saying
> the only way to go is to use branching.

Well, based on your scenarios (isolated development, commit without 
breaking other's or the HEAD code, etc.) it seems you're thinking the 
same thing :)

> By "break your sandbox" you mean prevent it from building not break the
> repository right?

Yes, I meant break your sandbox from building.  At that point the 
developer would have to merge updates from HEAD anyway into their 
modified files.

> 
> I understand your example and how it could cause problems and it is
> something to consider, I don't think that it will cause to many problems as
> our code is spread out enough and people generally work in pretty diverse
> area's of the code so people ususally don't colide.
> 
> By using the floating branch tag we almost get the best of both worlds
> 1. The developers new code is kept issolated on the branch and the branch is
> really only those changes made by the developer.
> 2. The developers get the lastest stable code from the release code line
> whenever they update thier sandbox.
> The only thing they don't get is any changes made on the release code line
> in files they have modified on the branch, to get those changes they must do
> an explicit merge from the parent to the branch.
> 
> I guess what I really want is a floating branch tag that only floats when
> you merge the parent onto the branch, that sounds a little more usefull than
> the way it's implimented now, it sort of prevents unexpected breaking and it
> helps to keep the task branch to purely task releated changes.   What do you
> think?

That's essentially what mergepoints do for you, and what makes them so 
valuable.  Then the developer decides when to get the latest -- gives 
them the control (OK, they have control over when they do an update, but 
I often update in order to reset accidental changes or other reasons).

Regards,

-- 
Glen Starrett



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook