[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: updating 3rd party code issues

From: Larry Jones
Subject: Re: updating 3rd party code issues
Date: Mon, 4 Oct 2010 10:56:59 -0400

kunal patel writes:
> Now I use following commands to merge the differences between two versions
> cvs checkout -jOSSL_0_9_8g_IOS0_6 -jOSSL_1_0_0a_IOS0_1 ios_openssl
> The merge is removing all the files that we added in previous version. These
> files did not come with 3rd party code but something I had added.

That sounds like you added your new files to the vendor branch rather
than to the trunk.  Once you've imported vendor source for the first
time, you need to check out the trunk and make your modifications there,
not in the vendor branch; otherwise, CVS can't tell what's your code and
what's vendor code.
Larry Jones

Wow, how existential can you get? -- Hobbes

reply via email to

[Prev in Thread] Current Thread [Next in Thread]