Re: Help needed with CVS

Hi Henrik,

At 22.07 16/05/2006, Henrik Nordstrom wrote:

>tis 2006-05-16 klockan 22:00 +0200 skrev Guido Serassio:
>
> > > cvsmergeinit nt-2_5 s2_5
> >
> > serassio@rea:~/nt-2.6$ cvsmergeinit nt-2_5 s2_5
> > /home/serassio/bin/cvsmergeinit: line 62: syntax error:
> unexpected end of file
>
>Looks like you are not using the current version..
>
>
>Ah, found the problem. For some reason the web site doesn't get properly
>updated. Fixed.

Yes, now looks better .... :-)

A last question:

The reference branch for me is the negotiate-nt-2_5 that is based on
nt-2_5 (based on s2_5)

So I can do directly

cvsmergeinit negotiate-nt-2_5 s2_5
cvsmerge negotiate-nt-2_5

or I need to do things in two steps ?

Regards

Guido

-
========================================================
Guido Serassio
Acme Consulting S.r.l. - Microsoft Certified Partner
Via Lucia Savarino, 1 10098 - Rivoli (TO) - ITALY
Tel. : +39.011.9530135 Fax. : +39.011.9781115
Email: guido.serassio@acmeconsulting.it
WWW: http://www.acmeconsulting.it/
Received on Tue May 16 2006 - 14:14:04 MDT