Boost logo

Boost-Build :

Date view Thread view Subject view Author view

Subject: [Boost-build] [boost-build][svn] Property conflict in math/special_functions
From: Joachim Faulhaber (afojgo_at_[hidden])
Date: 2012-03-27 06:30:50

Hi all,

when I was doing an svn-update (tortoise-svn) on
boost/branches/release I got property conflicts in
math/special_functions which is weird, because I never touched those
areas of boost in any way.

What do I do to resolve these conflicts?

Regards,
Joachim

SVN error log:
-------------------------------------------------------
Trying to delete property 'svn:mergeinfo' with value
'/devel/boost/math/special_functions:38327-38328
/trunk/boost/boost/math/special_functions:33417-38326
/trunk/boost/math/special_functions:38329-75284,75431,75540,75578,75733,75811,75821-75822,76027-76029,76034-76035,76051,76055'
but it has been modified from '/devel/boost/math/special_functions:38327-38328
/trunk/boost/boost/math/special_functions:33417-38326
/trunk/boost/math/special_functions:38329-75284,75431,75540,75578,75733,75811,75821-75822,76027-76029,76034-76035,76051,76055'
to '/devel/boost/math/special_functions:38327-38328
/trunk/boost/boost/math/special_functions:33417-38326
/trunk/boost/math/special_functions:38329-75284,75431,75540,75578,75733,75811,75821-75822,76027-76029,76034-76035,76051,76055,76249'. 

-- 
Interval Container Library [Boost.Icl]
http://www.joachim-faulhaber.de
Date view Thread view Subject view Author view

Boost-Build list run by bdawes at acm.org, david.abrahams at rcn.com, gregod at cs.rpi.edu, cpdaniel at pacbell.net, john at johnmaddock.co.uk