yade-users team mailing list archive

Thread
Date

Re: Can bzr conflicts appear from nowhere ?

To: yade-users@xxxxxxxxxxxxxxxxxxx
From: Jerome Duriez <jerome.duriez@xxxxxxxxxxxxxxx>
Date: Thu, 06 May 2010 10:36:30 +0200
In-reply-to: <1273080132.2278.9.camel@flux>
Reply-to: jerome.duriez@xxxxxxxxxxxxxxx
User-agent: Thunderbird 2.0.0.24 (X11/20100317)


Václav Šmilauer a écrit :

Try "bzr st" (or bzr status) to see status of your files.

Just after update to r2203, "bzr st" gave me indeed a "huge" list ofmodified files (joined, in a case). With lot of files I even did notknow they exist...

I did "bzr revert", and it's ok now.
Thus that's all now ! (even if I did not understand anything)

Thanks guys,

Jerome

jduriez@c1solimara-l:~/yade$ bzr st                                                                                                                                                
removed:                                                                                                                                                                           
  extra/floating_point_utilities_v3/                                                                                                                                               
  extra/floating_point_utilities_v3/README                                                                                                                                         
  extra/floating_point_utilities_v3/boost/                                                                                                                                         
  extra/floating_point_utilities_v3/boost/math/                                                                                                                                    
  extra/floating_point_utilities_v3/boost/math/detail/                                                                                                                             
  extra/floating_point_utilities_v3/boost/math/detail/fp_traits.hpp                                                                                                                
  extra/floating_point_utilities_v3/boost/math/fpclassify.hpp                                                                                                                      
  extra/floating_point_utilities_v3/boost/math/nonfinite_num_facets.hpp                                                                                                            
  extra/floating_point_utilities_v3/boost/math/signbit.hpp                                                                                                                         
  extra/introspection/                                                                                                                                                             
  extra/introspection/README                                                                                                                                                       
  extra/introspection/boost/                                                                                                                                                       
  extra/introspection/boost/introspection/                                                                                                                                         
  extra/introspection/boost/introspection/has_member_data.hpp                                                                                                                      
  extra/introspection/boost/introspection/has_member_function.hpp                                                                                                                  
  extra/introspection/boost/introspection/traits.hpp                                                                                                                               
  extra/introspection/libs/                                                                                                                                                        
  extra/introspection/libs/introspection/                                                                                                                                          
  extra/introspection/libs/introspection/doc/                                                                                                                                      
  extra/introspection/libs/introspection/example/                                                                                                                                  
  extra/introspection/libs/introspection/example/Jamfile.v2                                                                                                                        
  extra/introspection/libs/introspection/example/has_member_data.cpp                                                                                                               
  extra/introspection/libs/introspection/example/has_member_function.cpp                                                                                                           
  extra/introspection/libs/introspection/test/                                                                                                                                     
  lib/serialization/ObjectIO.hpp                                                                                                                                                   
renamed:                                                                                                                                                                           
  pkg/dem/DataClass/InteractionPhysics/CohFrictPhys.cpp => pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.cpp                                           
  pkg/dem/DataClass/InteractionPhysics/CohFrictPhys.hpp => pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.hpp                                           
  pkg/dem/DataClass/Material/CohFrictMat.cpp => pkg/dem/DataClass/Material/CohesiveFrictionalMat.cpp                                                                               
  pkg/dem/DataClass/Material/CohFrictMat.hpp => pkg/dem/DataClass/Material/CohesiveFrictionalMat.hpp                                                                               
  pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_CohFrictPhys.cpp => pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp                                                          
  pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_CohFrictPhys.hpp => pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.hpp                                                          
modified:                                                                                                                                                                          
  SConstruct                                                                                                                                                                       
  attic/pkg/dem/PreProcessor/Funnel.cpp                                                                                                                                            
  attic/pkg/dem/PreProcessor/MembraneTest.cpp                                                                                                                                      
  attic/pkg/dem/PreProcessor/SDECImpactTest.cpp                                                                                                                                    
  attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.cpp                                                                                                     
  attic/pkg/dem/RenderingEngine/GLDrawCohesiveFrictionalContactInteraction.hpp                                                                                                     
  attic/pkg/snow/Engine/ElawSnowLayersDeformation.cpp                                                                                                                              
  attic/pkg/snow/PreProcessor/SnowCreepTest.cpp                                                                                                                                    
  attic/pkg/snow/PreProcessor/SnowVoxelsLoader.cpp                                                                                                                                 
  core/FileGenerator.cpp                                                                                                                                                           
  core/FrontEnd.hpp                                                                                                                                                                
  core/Omega.cpp                                                                                                                                                                   
  core/Omega.hpp                                                                                                                                                                   
  gui/qt3/GLViewer.cpp                                                                                                                                                             
  lib/serialization/Serializable.hpp                                                                                                                                               
  pkg/common/DataClass/Shape/Facet.hpp                                                                                                                                             
  pkg/dem/DataClass/InteractionPhysics/NormalInelasticityPhys.hpp                                                                                                                  
  pkg/dem/DataClass/SpherePack.cpp                                                                                                                                                 
  pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_NormalInelasticityPhys.cpp                                                                                                              
  pkg/dem/Engine/Functor/Ip2_2xCohFrictMat_NormalInelasticityPhys.hpp                                                                                                              
  pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.cpp                                                                                                                       
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp                                                                                                                     
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp                                                                                                                     
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp                                                                                                                                
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp                                                                                                                                
  pkg/dem/Engine/GlobalEngine/MicroMacroAnalyser.cpp                                                                                                                               
  pkg/dem/Engine/GlobalEngine/NormalInelasticityLaw.cpp                                                                                                                            
  pkg/dem/Engine/GlobalEngine/NormalInelasticityLaw.hpp                                                                                                                            
  pkg/dem/Engine/GlobalEngine/TesselationWrapper.cpp                                                                                                                               
  pkg/dem/Engine/GlobalEngine/TesselationWrapper.hpp                                                                                                                               
  pkg/dem/Engine/PartialEngine/ThreeDTriaxialEngine.cpp                                                                                                                            
  pkg/dem/Engine/PartialEngine/TriaxialCompressionEngine.cpp                                                                                                                       
  pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp                                                                                                                        
  pkg/dem/PreProcessor/CohesiveTriaxialTest.cpp                                                                                                                                    
  pkg/dem/PreProcessor/DirectShearCis.cpp                                                                                                                                          
  pkg/dem/PreProcessor/STLImporterTest.cpp                                                                                                                                         
  pkg/dem/PreProcessor/SimpleShear.cpp                                                                                                                                             
  pkg/dem/PreProcessor/TriaxialTest.cpp                                                                                                                                            
  pkg/dem/PreProcessor/TriaxialTestWater.cpp                                                                                                                                       
  py/yadeWrapper/yadeWrapper.cpp                                                                                                                                                   
  pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.cpp                                                                                                    
  pkg/dem/DataClass/InteractionPhysics/CohesiveFrictionalContactInteraction.hpp                                                                                                    
  pkg/dem/DataClass/Material/CohesiveFrictionalMat.cpp                                                                                                                             
  pkg/dem/DataClass/Material/CohesiveFrictionalMat.hpp                                                                                                                             
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp                                                                                                                       
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.hpp                                                                                                                       
unknown:                                                                                                                                                                           
  .directory                                                                                                                                                                       
  Doxyfile                                                                                                                                                                         
  ExposeVaclav.pdf                                                                                                                                                                 
  Yade.kdevelop.filelist                                                                                                                                                           
  Yade.kdevelop.pcs                                                                                                                                                                
  Yade.kdevses                                                                                                                                                                     
  scons-local/                                                                                                                                                                     
  lib/serialization/Serializable.hpp.BASE                                                                                                                                          
  lib/serialization/Serializable.hpp.OTHER                                                                                                                                         
  lib/serialization/Serializable.hpp.THIS                                                                                                                                          
  pkg/common/DataClass/Shape/Facet.hpp.BASE                                                                                                                                        
  pkg/common/DataClass/Shape/Facet.hpp.OTHER                                                                                                                                       
  pkg/common/DataClass/Shape/Facet.hpp.THIS                                                                                                                                        
  pkg/dem/DataClass/SpherePack.cpp.BASE                                                                                                                                            
  pkg/dem/DataClass/SpherePack.cpp.OTHER                                                                                                                                           
  pkg/dem/DataClass/SpherePack.cpp.THIS                                                                                                                                            
  pkg/dem/Engine/Functor/.directory                                                                                                                                                
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.BASE                                                                                                                  
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.BASE.moved                                                                                                            
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.OTHER                                                                                                                 
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.OTHER.moved                                                                                                           
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.THIS                                                                                                                  
  pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.THIS.moved                                                                                                            
  pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.cpp.BASE                                                                                                                  
  pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.cpp.OTHER                                                                                                                 
  pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.cpp.THIS                                                                                                                  
  pkg/dem/Engine/GlobalEngine/.directory                                                                                                                                           
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp.BASE                                                                                                                
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp.OTHER                                                                                                               
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp.THIS                                                                                                                
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp.BASE                                                                                                                
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp.OTHER                                                                                                               
  pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp.THIS                                                                                                                
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp.BASE                                                                                                                           
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp.OTHER                                                                                                                          
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp.THIS                                                                                                                           
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp.BASE                                                                                                                           
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp.OTHER                                                                                                                          
  pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp.THIS                                                                                                                           
  pkg/dem/Engine/PartialEngine/KinemSimpleShearBox.cpp                                                                                                                             
  pkg/dem/Engine/PartialEngine/KinemSimpleShearBox.hpp                                                                                                                             
  pkg/dem/Engine/PartialEngine/StressDirecResearchEngine.cpp                                                                                                                       
  pkg/dem/Engine/PartialEngine/StressDirecResearchEngine.hpp                                                                                                                       
  pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp.BASE                                                                                                                   
  pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp.OTHER                                                                                                                  
  pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp.THIS                                                                                                                   
  py/yadeWrapper/yadeWrapper.cpp.BASE                                                                                                                                              
  py/yadeWrapper/yadeWrapper.cpp.OTHER                                                                                                                                             
  py/yadeWrapper/yadeWrapper.cpp.THIS                                                                                                                                              
conflicts:                                                                                                                                                                         
  Text conflict in lib/serialization/Serializable.hpp                                                                                                                              
  Text conflict in pkg/common/DataClass/Shape/Facet.hpp                                                                                                                            
  Text conflict in pkg/dem/DataClass/SpherePack.cpp                                                                                                                                
  Text conflict in pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp                                                                                                      
  Conflict adding file pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.BASE.  Moved existing file to pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.BASE.moved.                                                                                                                                                                                  
  Conflict adding file pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.OTHER.  Moved existing file to pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.OTHER.moved.                                                                                                                                                                                
  Conflict adding file pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.THIS.  Moved existing file to pkg/dem/Engine/Functor/CohesiveFrictionalRelationships.cpp.THIS.moved.                                                                                                                                                                                  
  Text conflict in pkg/dem/Engine/Functor/Ip2_FrictMat_FrictMat_FrictPhys.cpp                                                                                                       
  Text conflict in pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.cpp                                                                                                     
  Text conflict in pkg/dem/Engine/GlobalEngine/CohesiveFrictionalContactLaw.hpp                                                                                                     
  Text conflict in pkg/dem/Engine/GlobalEngine/ElasticContactLaw.cpp                                                                                                                
  Text conflict in pkg/dem/Engine/GlobalEngine/ElasticContactLaw.hpp                                                                                                                
  Text conflict in pkg/dem/Engine/PartialEngine/TriaxialStressController.hpp                                                                                                        
  Text conflict in py/yadeWrapper/yadeWrapper.cpp

References

Can bzr conflicts appear from nowhere ?
From: Jerome Duriez, 2010-05-05
Re: Can bzr conflicts appear from nowhere ?
From: Anton Gladky, 2010-05-05
Re: Can bzr conflicts appear from nowhere ?
From: Jerome Duriez, 2010-05-05
Re: Can bzr conflicts appear from nowhere ?
From: Jerome Duriez, 2010-05-05
Re: Can bzr conflicts appear from nowhere ?
From: Václav Šmilauer, 2010-05-05