bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

RE: cvs conflict resolution bug ?


From: Baptiste Lepilleur
Subject: RE: cvs conflict resolution bug ?
Date: Thu, 14 Jun 2001 12:32:26 +0200

Thanks you very much.

We upgraded to 1.11.1p1(our admin grumbled because there was no rpm version but
it's done ;-) ) and the bug is indeed solved (as well as another one that I had
not yet investigated).

Things look good for me and there is hope ;-)

Baptiste.

> -----Message d'origine-----
> De : Jacob Burckhardt [mailto:address@hidden
> Envoye : jeudi 14 juin 2001 08:14
> A : address@hidden
> Cc : address@hidden; address@hidden
> Objet : cvs conflict resolution bug ?
>
>
> Baptiste Lepilleur writes:
> > the conflict report is
> > missing a part of the block of text that was removed.
> >
> ...
> > This problem occured with cvs server version 1.10.2 and CVS
> 1.11 running on a
> > linux box, and using either WinCVS 1.2 or CVS 1.10.2 as a
> client on the linux
> > box with cvs server version 1.10.2 in command line mode.
>
> The cvs versions you mentioned have bugs which can produce this kind
> of result.  The bug was fixed in version 1.11.1.  I was able to
> reproduce your wrong merged file using cvs 1.11.  I then ran your test
> cases through cvs-1.11.1p1 and it outputted the text below which I
> believe to be correct:
>
> //////////////////////////////////////////////////////////////
> /////////////////
>
> <<<<<<< t
> =======
> //      Ajoute une propriete
> bool WilPlnResDataAtt::AddPrp( WilPrp *pPrp, int index )
> {
>         if ( WilUAtt::AddPrp( pPrp, index ) ) {
>
>                 pPrp->GetZone( zCode, m_nCode );
>                 pPrp->GetZone( zNCourbe, m_nNCourbe );
>                 pPrp->GetZone( zNData, m_nNData );
>                 pPrp->GetZone( zFromPeriod, m_FromPeriod );
>                 pPrp->GetZone( zCapaPeriod, m_dCapaPeriod );
>                 pPrp->GetZone( zNeedPeriod, m_dNeedPeriod );
>                 pPrp->GetZone( zAlertExp, m_bAlertExp );
>
>                 return true ;
>         }
>         return false ;
> }
> >>>>>>> 1.1.1.1.2.1
>
> //////////////////////////////////////////////////////////////
> /////////////////
>




reply via email to

[Prev in Thread] Current Thread [Next in Thread]