[ECOS] Keeping 2.0 source tree up to date

[David Vrabel]

[Oops.  Sent this too the wrong list.]

Reinhard JESSICH wrote:
>
> I would *not suggest* using the vendor branch feature of CVS directly on the main branch,
> as you might end up with an inconsistent state (at least temporarily).
> 
> Here is what we are doing:
> 
> We checked out a local copy from the annon CVS. Then we imported
> it to our CVS main branch with the "cvs import" command. After that we created a branch
> and started our own developments on this branch.
> 
> We have a cron job running, which will update the local copy of the annon CVS weekly and
> generate a diff report about the ChangeLog files. This report is checked by the developers
> and if there is an interesting change, we import from the local copy of the annon CVS to our
> main branch "cvs import vendor-tag release-tag". We do this at least once in two months,
> to keep track of the ongoing development.
> 
> As a final step we incorporate the changes on the main branch (same as annon CVS) into
> our development branch. This is now very simple. Use:
> "cvs update -j last-release -j new-release". This command will update our development with
> only those changes, which were made between the two releases. last-release and new-release
> are the release tags which were defined with "cvs import".
> 
> Note, that it is important to work on an development branch, because the "cvs import"
> command automatically merges and commits. If you work directly on the main
> branch you are not really happy about this (I know it from experience).

Er.  This sounds like using a vendor branch only you're using the main
branch as the vendor branch and your development branch as the main branch.

FWIW, find two scripts attached that we use.

David Vrabel
-- 
David Vrabel, Design Engineer

Arcom                         Tel: +44 (0)1223 411200 ext. 3233
Clifton Road                  Fax: +44 (0)1223 403400
Cambridge CB1 7EA             E-mail: dvrabel@arcom.com
UK                            Web: http://www.arcom.com/


________________________________________________________________________
This email has been scanned for all viruses by the MessageLabs Email
Security System. For more information on a proactive email security
service working around the clock, around the globe, visit
http://www.messagelabs.com
________________________________________________________________________
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: edk-ecos-commit-merge
URL: <http://sourceware.org/pipermail/ecos-discuss/attachments/20030923/a97f3c21/attachment.ksh>
-------------- next part --------------
An embedded and charset-unspecified text was scrubbed...
Name: edk-ecos-import-upstream
URL: <http://sourceware.org/pipermail/ecos-discuss/attachments/20030923/a97f3c21/attachment-0001.ksh>
-------------- next part --------------
-- 
Before posting, please read the FAQ: http://sources.redhat.com/fom/ecos
and search the list archive: http://sources.redhat.com/ml/ecos-discuss