You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by rh...@apache.org on 2011/07/02 23:40:12 UTC
svn propchange: r1142315 - svn:log
Author: rhuijben
Revision: 1142315
Modified property: svn:log
Modified: svn:log at Sat Jul 2 21:40:12 2011
------------------------------------------------------------------------------
--- svn:log (original)
+++ svn:log Sat Jul 2 21:40:12 2011
@@ -12,6 +12,8 @@ additional database call in svn.
missing depends on the the kind of tree conflict.
(send_unversioned_item): Update arguments to update caller.
(get_dir_status): Handle the conflict and non conflict cases.
+ (is_sendable_status): Always report conflicted nodes, even if they have
+ status svn_wc_status_ignored.
(internal_status): Read conflicted boolean from db__read_info() to fetch
the unversioned tree conflict status.