AlienWolf {l Wrote}:I think git is being used now (huge improvement from the original CVS ).
AlienWolf {l Wrote}:2. If you have pushed back to origin, best not to do the above since a reset combined with a force push can cause the branch to diverge for other devs, so instead you can make a revert commit with:
eg Revert commit with sha1 abc123
git revert abc123
[ 0%] Building CXX object CMakeFiles/OpenDungeons.bin.dir/dependencies/angelscript/angelscript/source/as_atomic.cpp.o
cc1plus: error: unrecognized command line option ‘-std=c++11’
make[2]: *** [CMakeFiles/OpenDungeons.bin.dir/dependencies/angelscript/angelscript/source/as_atomic.cpp.o] Error 1
make[1]: *** [CMakeFiles/OpenDungeons.bin.dir/all] Error 2
make: *** [all] Error 2
[ 31%] Building CXX object CMakeFiles/OpenDungeons.bin.dir/dependencies/tinygettext/dictionary_manager.cpp.o
In file included from /usr/include/boost/thread/pthread/condition_variable.hpp:10:0,
from /usr/include/boost/thread/condition_variable.hpp:16,
from /usr/include/boost/thread/condition.hpp:9,
from /usr/include/OGRE/Threading/OgreThreadHeadersBoost.h:31,
from /usr/include/OGRE/Threading/OgreThreadHeaders.h:30,
from /usr/include/OGRE/OgreStdHeaders.h:114,
from /usr/include/OGRE/OgrePrerequisites.h:315,
from /usr/include/OGRE/OgreSingleton.h:41,
from /home/domtron/games/opendoungen/opendungeons-git/source/ResourceManager.h:14,
from /home/domtron/games/opendoungen/opendungeons-git/dependencies/tinygettext/dictionary_manager.cpp:19:
/usr/include/boost/thread/pthread/thread_data.hpp: In constructor ‘boost::detail::tss_data_node::tss_data_node(boost::shared_ptr<boost::detail::tss_cleanup_function>, void*)’:
/usr/include/boost/thread/pthread/thread_data.hpp:36:41: error: use of deleted function ‘boost::shared_ptr<boost::detail::tss_cleanup_function>::shared_ptr(const boost::shared_ptr<boost::detail::tss_cleanup_function>&)’
make[2]: *** [CMakeFiles/OpenDungeons.bin.dir/dependencies/tinygettext/dictionary_manager.cpp.o] Error 1
make[1]: *** [CMakeFiles/OpenDungeons.bin.dir/all] Error 2
make: *** [all] Error 2
Users browsing this forum: No registered users and 1 guest