Need help merging thread-initial into main trunk

From: Beman Dawes (bdawes_at_[hidden])
Date: 2001-09-25 12:08:29

Help!

I'm trying to merge the thread-initial CVS branch into the main trunk.

For the boost header directory, the merge process worked for three files 
but not the others.  See log below.

Any clues what the problem is and how to fix it?

Thanks,

--Beman

cvs update -P -d -jthread-initial (in directory C:\BOOST\SITE\boost\)
...
cvs server: Updating regex
cvs server: Updating regex/detail
cvs server: Updating test
cvs server: Updating thread
cvs server: file thread/condition.hpp is present in revision thread-initial
cvs server: file thread/config.hpp is present in revision thread-initial
U thread/exceptions.hpp
cvs server: file thread/mutex.hpp is present in revision thread-initial
U thread/once.hpp
cvs server: file thread/recursive_mutex.hpp is present in revision 
thread-initial
cvs server: file thread/semaphore.hpp is present in revision thread-initial
cvs server: file thread/thread.hpp is present in revision thread-initial
cvs server: file thread/tss.hpp is present in revision thread-initial
cvs server: file thread/xtime.hpp is present in revision thread-initial
cvs server: Updating thread/detail
U thread/detail/lock.hpp
cvs server: Updating tuple
cvs server: Updating tuple/detail
cvs server: Updating type_traits
cvs server: Updating utility

*****CVS exited normally with code 0*****

Saved settings for C:\BOOST\SITE successfully...
cvs commit -m "commit after merging thread-initial into main trunk" (in 
directory C:\BOOST\SITE\boost\thread\)
cvs commit: Examining .
cvs commit: Examining detail
Checking in exceptions.hpp;
/cvsroot/boost/boost/boost/thread/exceptions.hpp,v  <--  exceptions.hpp
new revision: 1.2; previous revision: 1.1
done
Checking in once.hpp;
/cvsroot/boost/boost/boost/thread/once.hpp,v  <--  once.hpp
new revision: 1.2; previous revision: 1.1
done
Checking in detail/lock.hpp;
/cvsroot/boost/boost/boost/thread/detail/lock.hpp,v  <--  lock.hpp
new revision: 1.2; previous revision: 1.1
done

*****CVS exited normally with code 0*****