Re: [NILO-discuss] CVS

[Michael B. <mb...@fe...>]

On Tue, 8 Mar 2005, Michael Brown wrote:
> Code is imported.  There's a script, ebsync.pl, that can be used at any
> time to sync across current Etherboot CVS to the EB_CVS branch of NILO
> CVS.  This does *not* automatically merge changes from the EB_CVS branch
> into the NILO HEAD branch; that part must currently be done manually
> using something along the lines of
> 
>    cvs update -jEB_LAST_SYNC -jEB_CVS
> 
> then resolving all the conflicts, checking in the changes and reassigning 
> the tag EB_LAST_SYNC with
> 
>    cvs tag -r EB_CVS EB_LAST_SYNC
> 
> I'll probably automate this process the first time I need to use it.

Quick but important notification: I have fixed a bug that meant that the 
EB_CVS branch ended up as the default branch for NILO.  If you have a CVS 
checkout of NILO, please update it to HEAD with

  cvs update -A

otherwise your version numbers will get screwed up and you'll have to 
spend ages fixing them.

Michael