Re: Multiple sources in a vendor branch

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Rohan Nandode <address@hidden> writes:

> Rohan Nandode wrote:
> > Hi,
> > The problem descriptions goes like this:
> > I have a vendor branch(1.1.3) for 3rd party library - say "library1"
> > along with my project source in my CVS. I have done some
> > modifications to the sources in library1.
> > Now I there is a latest release of the library1 and I would like to
> > upgrade it. But the problem is that I am not sure of how much stable
> > will be the upgraded version. Hence I would like to work with
> > whatever version of the library I have in the cvs and test the
> > latest version of the library also. So when someone takes update
> > from the cvs, I do not want him to take latest imported version of
> > 'library1', but whatever was there before upgrading the library.
> > More over, I cannot tell him to use some tagged version of the
> > 'library1'!
> > In short, I want to upgrade the sources in vendor branch, but
> > sametime do not want them to be reflected directly to the users. The
> > users should be able take upgraded version of a library1, by
> > updating with some tag etc.
> > Is this possible with CVS?

Yes, but it requires that you force all of the files you consider to be
'stable' to be committed to the mainline before you do the import. If
you do that, then subsequent imports will need to be merged into the
mainline or some other branch before they may be used.

The easiest way to do this is probably to just do a commit with the
'cvs commit -f' option on all of the files that are part of library1.
Note that the -f option disables recursion, so you will need to come
up with the list of files you want to commit in this manner.

> > Please let me know if there is any work around for this.
> > The fast solution could be to create new separate vendor branch for
> > latest version of library1. But in that case, I would not be able to
> > able to merge the modification done into the latest version.
> > Thanks in advance
> > Rohan

        -- Mark
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFAKQJ53x41pRYZE/gRAqilAKDfUJPs7fI5/6L32MQBn6j/MjfZ1QCcCI0A
QqutaDZkusjO2P7Mo63qrhU=
=hqM6
-----END PGP SIGNATURE-----