Forum OpenACS Development: Re: cvs woes

Collapse
4: Re: cvs woes (response to 1)
Posted by russell muetzelfeldt on
but the point of vendor branches is to let you easily track local changes relative to a changing external source tree... if you just fix -HEAD without also fixing the tip of the vendor branch then when it comes time to do the *next* import cvs will consider your "local changes" to be the diff from the botched import to the current source tree rather than from the last good import to the current tree, leading to more pain down the track...

come to think of it, you wouldn't even need to do a 3-way merge... just re-do the last good vendor import with a new tag, then check out a working copy on the last tag from before the bad vendor import and re-commit it with "cvs ci -r HEAD"... this gets your vendor branch back in shape and brings -HEAD back to where it should be too...