[Top][All Lists]

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

cvs conflict resolution bug ?

From: Jacob Burckhardt
Subject: cvs conflict resolution bug ?
Date: Wed, 13 Jun 2001 18:06:45 -0700

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 ;


reply via email to

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