Hi Henrik,
At 21.46 16/05/2006, Henrik Nordstrom wrote:
>tis 2006-05-16 klockan 21:37 +0200 skrev Guido Serassio:
>
> > Just created a new "nt" branch.
> > But what is the better way to merge into it the
> > negotiate-nt-2_5 branch (it's based on nt-2_5) ?
>
>
>get the current version of cvsmergeinit, then run from your new nt
>branch working directory
Just downloaded it.
> 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
?
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:00:49 MDT
This archive was generated by hypermail pre-2.1.9 : Thu Jun 01 2006 - 12:00:04 MDT