svn-3396

Version:

1.6.2

Bug Link:

http://subversion.tigris.org/issues/show_bug.cgi?id=3396

Patch Link:

http://svn.apache.org/viewvc?diff_format=h&view=revision&revision=877234

Symptom:

‘svn status --quite’ doesn’t show tree conflicts.

How it is diagnosed:

discussion / dump

trunk.dbg>svn st merge_tests-63.immediates
M      merge_tests-63.immediates
M      merge_tests-63.immediates\B
!     C merge_tests-63.immediates\B\E
    >   local delete, incoming edit upon merge
M       merge_tests-63.immediates\mu
M      merge_tests-63.immediates\C
M      merge_tests-63.immediates\D
!     C merge_tests-63.immediates\D\H
    >   local delete, incoming edit upon merge

Before patch output:
trunk.dbg>svn st merge_tests-63.immediates
-q
M      merge_tests-63.immediates
M      merge_tests-63.immediates\B
M       merge_tests-63.immediates\mu
M      merge_tests-63.immediates\C
M      merge_tests-63.immediates\D

After patch output:
trunk.dbg>svn st merge_tests-63.immediates
M      merge_tests-63.immediates
M      merge_tests-63.immediates\B
!     C merge_tests-63.immediates\B\E
M       merge_tests-63.immediates\mu
M      merge_tests-63.immediates\C
M      merge_tests-63.immediates\D
!     C merge_tests-63.immediates\D\H

Root Cause:

Brief:

Missing condition in ‘if’ statement. Even in case of no entry, we may still have a tree conflict victim to show.

Detail:

The patch is :

--- subversion/trunk/subversion/svn/status.c        2009/04/10 14:02:45        877233
+++ subversion/trunk/subversion/svn/status.c        2009/04/10 14:29:04        877234
@@ -361,7 +361,7 @@
 svn_cl__print_status(const char *path,
                     apr_pool_t *pool)
{
  if (! status
-      || (skip_unrecognized && ! status->entry)

/* we still need to see if tree conflict happens or not even though there’s no entry(unversioned) */
+      || (skip_unrecognized && !(status->entry || status->tree_conflict))
      || (status->text_status == svn_wc_status_none
          && status->repos_text_status == svn_wc_status_none))
    return SVN_NO_ERROR;

Failure symptom category

wrong result

Is there any log message?

No

Can ErrLog help?

No