Change the 'svn status' letter for tree conflicts from 'T' to 'C', following
commit91acb0b79918694eda7edc22e2909b779ee2204b
authorJulian Foad <julian.foad@wandisco.com>
Fri, 26 Sep 2008 14:47:05 +0000 (26 14:47 +0000)
committerJulian Foad <julian.foad@wandisco.com>
Fri, 26 Sep 2008 14:47:05 +0000 (26 14:47 +0000)
tree16bf418f54b27bd2018536792769c18940945095
parent77b289b11354b48aba08ed3bc8e70dde2a90278f
Change the 'svn status' letter for tree conflicts from 'T' to 'C', following
discussion on the mailing list. A follow-up to r33288 which introduced it.

* subversion/svn/status.c
  (print_status): Print 'C' in the tree status column, not 'T'.

* subversion/tests/cmdline/stat_tests.py
  (status_with_tree_conflicts): Expect tree-conflict status 'C', not 'T'.

* subversion/tests/cmdline/svntest/tree.py
  (build_tree_from_status): Expect tree-conflict status 'C', not 'T'.

* subversion/tests/cmdline/svntest/wc.py
  (StateItem): Adjust the 'treeconflict' attribute doc-string accordingly.

git-svn-id: http://svn.apache.org/repos/asf/subversion/trunk/subversion/tests/cmdline@873384 13f79535-47bb-0310-9956-ffa450edef68
svntest/tree.py
svntest/wc.py