Alek Lapuc <[EMAIL PROTECTED]> wrote:

> The reason is simple. At the begining of the project we had some
> sources and include files supplied "out-of-the-box" with a commercial
> product. Than we done some customizations -- some files were added,
> some were changed, some were untouched.

> The main idea is to filter out the untouched files, so they are
> separated from out-of-the-box ones.

> The reason for this is that files out-of-the-box can be automatically
> patched while patching the whole product with official patch. The
> patch is prepared outside to our project. Our changes are not known to
> the product vendor, and most propably would be corrupted during such a
> patch. But having original and customized files separated, we can
> apply the patch and merge it manually to our sources if needed.

Tracking third party sources in the presence of local changes is what
the 'cvs import' command does.  The external sources are usually
delivered as tarballs or zip archives, but applying patches will work
too.

So check out your last import tag, patch it, reimport the result
and merge your trunk.

_______________________________________________
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs

Reply via email to