SVN commands

svn stat | grep “^ .”

It means display all files which the first character in svn info is space.

the sample result will be

M      com.elasticpath.search

M      com.elasticpath.search\integrationtests\fittests\search\sorting

That the first character is space means only merge info is modified.

$ svn diff  com.elasticpath.core/WEB-INF/src/main/java/com/elasticpath/domain/contentspace/impl/DynamicContentImpl.java 
Property changes on: com.elasticpath.core\WEB-INF\src\main\java\com\elasticpath\domain\contentspace\impl\DynamicContentImpl.java__________________________________________________________________

Modified: svn:mergeinfo

   Merged /pd/ep5/trunk/com.elasticpath.core/WEB-INF/src/main/java/com/elasticpath/domain/contentspace/impl/DynamicContentImpl.java:r71380-71657

 

svn stat |grep ^C

Display all conflictions.