subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From julianf...@apache.org
Subject svn commit: r1442720 - /subversion/trunk/subversion/tests/cmdline/svntest/main.py
Date Tue, 05 Feb 2013 20:10:06 GMT
Author: julianfoad
Date: Tue Feb  5 20:10:06 2013
New Revision: 1442720

URL: http://svn.apache.org/viewvc?rev=1442720&view=rev
Log:
* subversion/tests/cmdline/svntest/main.py
  (summary_of_conflicts): Notice the new 'skipped_paths' parameter.
    A follow-up to r1442705.

Modified:
    subversion/trunk/subversion/tests/cmdline/svntest/main.py

Modified: subversion/trunk/subversion/tests/cmdline/svntest/main.py
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/tests/cmdline/svntest/main.py?rev=1442720&r1=1442719&r2=1442720&view=diff
==============================================================================
--- subversion/trunk/subversion/tests/cmdline/svntest/main.py (original)
+++ subversion/trunk/subversion/tests/cmdline/svntest/main.py Tue Feb  5 20:10:06 2013
@@ -1193,7 +1193,7 @@ def summary_of_conflicts(text_conflicts=
      parameters are zero, return an empty list.
   """
   lines = []
-  if text_conflicts or prop_conflicts or tree_conflicts:
+  if text_conflicts or prop_conflicts or tree_conflicts or skipped_paths:
     lines.append("Summary of conflicts:\n")
     if text_conflicts:
       lines.append("  Text conflicts: %d\n" % text_conflicts)



Mime
View raw message