Hi Henrik,
At 12.04 11/12/2008, Henrik Nordstrom wrote:
>tor 2008-12-11 klockan 11:45 +0100 skrev Guido Serassio:
>
> > Using cvsview I can see the files marked dead without a cvs revision.
> >
> > Probably the missing merge is coming from the old .cvsignore file,
> > that I have changed AFTER the cvsmerge instead of BEFORE ....
>
>Or more likely there was a silent merge conflict due to the files
>already existing in your nt branch working directory.
>
>cvs add *.gif
>
>in your nt working directory should fix this.
Yes, now fixed.
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_at_acmeconsulting.it
WWW: http://www.acmeconsulting.it/
Received on Thu Dec 11 2008 - 21:25:42 MST
This archive was generated by hypermail 2.2.0 : Fri Dec 12 2008 - 12:00:07 MST
