subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From cmpil...@apache.org
Subject svn commit: r1203690 - /subversion/trunk/subversion/svn/status.c
Date Fri, 18 Nov 2011 15:15:45 GMT
Author: cmpilato
Date: Fri Nov 18 15:15:44 2011
New Revision: 1203690

URL: http://svn.apache.org/viewvc?rev=1203690&view=rev
Log:
For issue #1935 ("svn status too verbose with svn:externals
definitions"), continue trying to refile the filtering of "X" lines.

* subversion/svn/status.c
  (svn_cl__print_status): Don't mask out conflict externals.

Modified:
    subversion/trunk/subversion/svn/status.c

Modified: subversion/trunk/subversion/svn/status.c
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/svn/status.c?rev=1203690&r1=1203689&r2=1203690&view=diff
==============================================================================
--- subversion/trunk/subversion/svn/status.c (original)
+++ subversion/trunk/subversion/svn/status.c Fri Nov 18 15:15:44 2011
@@ -554,7 +554,8 @@ svn_cl__print_status(const char *cwd_abs
     {
       /* ... skip regular externals unmodified in the repository. */
       if ((status->node_status == svn_wc_status_external)
-          && (status->repos_node_status == svn_wc_status_none))
+          && (status->repos_node_status == svn_wc_status_none)
+          && (! status->conflicted))
         return SVN_NO_ERROR;
 
       /* ... skip file externals that aren't modified locally or
@@ -568,7 +569,8 @@ svn_cl__print_status(const char *cwd_abs
               || (status->prop_status == svn_wc_status_none))
           && (! status->changelist)
           && (! status->lock)
-          && (! status->wc_is_locked))
+          && (! status->wc_is_locked)
+          && (! status->conflicted))
         return SVN_NO_ERROR;
     }
 



Mime
View raw message