diff options
Diffstat (limited to 'subversion/libsvn_wc/diff_local.c')
| -rw-r--r-- | subversion/libsvn_wc/diff_local.c | 24 |
1 files changed, 8 insertions, 16 deletions
diff --git a/subversion/libsvn_wc/diff_local.c b/subversion/libsvn_wc/diff_local.c index ad87c76..620630a 100644 --- a/subversion/libsvn_wc/diff_local.c +++ b/subversion/libsvn_wc/diff_local.c @@ -195,23 +195,15 @@ diff_status_callback(void *baton, struct diff_baton *eb = baton; svn_wc__db_t *db = eb->db; - switch (status->node_status) - { - case svn_wc_status_unversioned: - case svn_wc_status_ignored: - return SVN_NO_ERROR; /* No diff */ - - case svn_wc_status_conflicted: - if (status->text_status == svn_wc_status_none - && status->prop_status == svn_wc_status_none) - { - /* Node is an actual only node describing a tree conflict */ - return SVN_NO_ERROR; - } - break; + if (! status->versioned) + return SVN_NO_ERROR; /* unversioned (includes dir externals) */ - default: - break; /* Go check other conditions */ + if (status->node_status == svn_wc_status_conflicted + && status->text_status == svn_wc_status_none + && status->prop_status == svn_wc_status_none) + { + /* Node is an actual only node describing a tree conflict */ + return SVN_NO_ERROR; } /* Not text/prop modified, not copied. Easy out */ |
