Re: How to import Changes into a Branch ?

[Mark D. Baushke]

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

Masanori Watanabe <address@hidden> writes:

> Hi, I have a question about the use of Branch and
> import.
> Here's my branch structure. 
> 
> The main trunk keeps the release codes.
> When we start the development of a new release we
> create a couple of release development branches like
> Release10-unit, Release-10-qa, etc.
> Programmers will post their changes to Release10-unit.
> When the unit test is complete, they request the CVS
> administrator to migrate the code change to the next
> stage , Release-10-qa where tester will test the
> codes.
> After the QA is done, the code will finally make it to
> the release and merged into the main trunk.
> 
> My problme is that we occasionally need to accept the
> code changes from outside programmers or vendors.
> I want to use 'import' function to take these changes
> into our repository.
> But I could not figure out how I can import sources
> into a specific Branch instead of main trunk.
> 
> I'm wondering if the branches should not be designed
> this way or the import function simply does not
> support what I want to do. 
> Any advise would be very appreciated.
> Thank you.
> 
> Masa

In the typical case, such an organization would commit a
change to every file in the 'cvs import' tree. This means
that when you want to get a newly imported change into the
mainline you will need to merge the code base that has been
imported.

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

iD8DBQFAFipm3x41pRYZE/gRAuFoAKCZrXee71KCqBrPlerpW+6+0Ms+gQCfSq8z
aHsDZeUkmxZ8SHx8fzZGnDM=
=laLR
-----END PGP SIGNATURE-----