[cvsnt] Re: mergepoint and removed files
boga
boga at mac.com
Fri Jan 28 05:49:09 GMT 2005
>> I know this has been already discussed on this list, with non
positive
>> reply. But we have a lot of troubles because of non removed files.
>
>If you're getting a lot of this then review your working processes -
>people should *not* be routinely working on files that have been
removed
>elsewhere.
We aren't working on those files. We're using the "Private Workspace"
SCM pattern: each project has it's own branch.
1. The project merges modifications from HEAD to their branch (with CVS
up -j).
2. Then someone removes the file in the HEAD branch.
3. The project merges modifications from HEAD again, but the file is
not removed.
So the different revision numbers are the result of merge and not
actual modifications.
I'm suggest adding the following condition the the remove:
"If last revision of the file (we're merging into) was a result of a
merge from HEAD, and file removed on HEAD then remove it on Project
branch."
Regards,
Miklós
More information about the cvsnt
mailing list