Re: RV: Newbie question. How to manage replaced files

[Pierre Asselin]

N?stor Bosc?n <address@hidden> wrote:
>  
> I have been using CVS for some time and have encounter problems when
> somebody gives me a file that I have to replaced in my CVS sandbox. This
> always happens because sometimes I have people outside the organization and
> they send new versions of files that I have to replace in the sandbox and
> try to update and commit to the CVS Repository. What is the best way to
> manage this case?

I would figure out what revision of the file the external user started with.
Then I would create a branch at that revision, commit the modification to
that branch and see if I can merge the branch back to the trunk.

By extension, if people send you patch of the entire source tree, *based
on a released version*, you can branch the entire tree off the corresponding
release tag, apply the patch, commit, and decide whether you want to
merge the branch.

If you can't determine the revision or tag from which to branch,
you probably need to tighten your controls a little...

-- 
pa at panix dot com