Re: Forking off a remote public cvs. Howto merge the parallelldevelopment?

[Pierre Asselin]

Erik =?ISO-8859-1?Q?Sj=F6lund?= <address@hidden> writes:

>What possibilities are there to merge in new releases=20
>from the public cvs into our forked code in the future?

It's standard.  It can be difficult if a new distribution has a
radically reorganized file tree, but since they are also using CVS,
that's not too likely.


>Is there a way to do it by importing multiple times, maybe?

Exactly.

    cvs import <repository> VENDOR release_1

                        cvs checkout <module>
                        cvs commit
                        cvs commit
                        cvs commit
                          ...

    cvs import <repository> VENDOR release_2

                        cvs update -jrelease_1 -jrelease_2
                        (fix conflicts)
                        cvs commit
                        cvs commit
                        cvs commit
                          ...

    cvs import <repository> VENDOR release_3

                        cvs update -jrelease_2 -jrelease_3
                        (fix conflicts)
                        cvs commit
                          ...

--
Pierre Asselin
Westminster, Colorado


-----= Posted via Newsfeeds.Com, Uncensored Usenet News =-----
http://www.newsfeeds.com - The #1 Newsgroup Service in the World!
-----==  Over 80,000 Newsgroups - 16 Different Servers! =-----