Re: Help needed with CVS

Hi Henrik,

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

>tis 2006-05-16 klockan 22:25 +0200 skrev Henrik Nordstrom:
> > tis 2006-05-16 klockan 22:14 +0200 skrev Guido Serassio:
> >
> > > 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 ?
> >
> > Assuming negotiate-nt-2_5 is up to date with respect to nt-2_5 you
> > should be able to run
> >
> > cvsmergeinit negotiate-nt-2_5 -r Z_nt-2_5_nerge_s2_5
>
>_merge_, not _nerge_ ...

Sure .... :-)

It seems to work, now fixing conflicts, only eleven files, better
than expected .... :-)

FYI: there is still an error in cvsmergeinit: it checks for one or
two arguments, but using -z, the arguments are 3 ....

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:59:45 MDT