[SVN-3396] status --quiet doesn't show tree conflicts

• Type: Bug
• Status: Closed
• Priority: Minor
• Resolution: Fixed
• Affects Version/s: trunk
• Fix Version/s: 1.6.2
• Component/s: libsvn_client
• Labels: tree-conflicts
• Assignee: Unassigned
• Reporter: Paul Burba
• Created: 10/Apr/09 14:15
• Updated: 27/Oct/18 16:34
• Resolved: 10/Apr/09 14:35

Description

svn status --quiet doesn't show tree conflicts:

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

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

Per stsp (and I agree) the output should be:

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

See also http://svn.haxx.se/dev/archive-2009-04/0351.shtml