subversion-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Bert Huijben <b...@qqmail.nl>
Subject RE: Separating deprecated code.
Date Mon, 03 Jun 2013 09:30:21 GMT
This function is also used from deprecated code in libsvn_cliƫnt and
some binding code, unlike most other deprecated code...

In some ways this code is 'a bit less deprecated' ;-)

Bert From: Philip Martin
Sent: 03/06/2013 10:33
To: Barry Scott
Cc: Subversion Development
Subject: Separating deprecated code.
Philip Martin <philip.martin@wandisco.com> writes:

> Barry Scott <barry@barrys-emacs.org> writes:
>
>> Index: /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c
>> ===================================================================
>> --- /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c	(revision
1484244)
>> +++ /Users/barry/wc/svn/svn-1.8.x/subversion/libsvn_wc/tree_conflicts.c	(working
copy)
>> @@ -506,6 +506,7 @@
>>            return SVN_NO_ERROR;
>>          }
>>      }
>> +  *tree_conflict = NULL;
>>    return SVN_NO_ERROR;
>>  }
>
> Committed to trunk and nominated for backport.  Thanks!

This is a patch to svn_wc__get_tree_conflict which is only called from
util.c:svn_wc__status2_from_3 which is itself only called in the main
code from libsvn_wc/deprecated.c and libsvn_client/deprecated.c.  That
makes both svn_wc__get_tree_conflict and svn_wc__status2_from_3 only
necessary for support of the deprecated API.

Should we move the code to deprecated.c?  Should we add DEPRECATED
markings?  conflict-data-test.c also calls svn_wc__get_tree_conflict
which makes it an explicit test of the deprecated code.  If we mark the
functions DEPRECATED do we explicitly disable DEPRECATED warnings in the
test file?

-- 
Certified & Supported Apache Subversion Downloads:
http://www.wandisco.com/subversion/download

Mime
View raw message