Author: svn-role Date: Mon Nov 7 04:00:06 2022 New Revision: 1905110 URL: http://svn.apache.org/viewvc?rev=1905110&view=rev Log: Merge r1904936 from trunk:
* r1904936 Add @Deprecated decorations to avoid compiler warnings. Justification: Avoid some compiler warnings Votes: +1: dsahlberg, jamessan Modified: subversion/branches/1.14.x/ (props changed) subversion/branches/1.14.x/STATUS subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Propchange: subversion/branches/1.14.x/ ------------------------------------------------------------------------------ Merged /subversion/trunk:r1904936 Modified: subversion/branches/1.14.x/STATUS URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/STATUS?rev=1905110&r1=1905109&r2=1905110&view=diff ============================================================================== --- subversion/branches/1.14.x/STATUS (original) +++ subversion/branches/1.14.x/STATUS Mon Nov 7 04:00:06 2022 @@ -64,13 +64,6 @@ Veto-blocked changes: Approved changes: ================= - * r1904936 - Add @Deprecated decorations to avoid compiler warnings. - Justification: - Avoid some compiler warnings - Votes: - +1: dsahlberg, jamessan - * r1904938 Java binding fixes. Justification: Modified: subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java URL: http://svn.apache.org/viewvc/subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java?rev=1905110&r1=1905109&r2=1905110&view=diff ============================================================================== --- subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java (original) +++ subversion/branches/1.14.x/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClient.java Mon Nov 7 04:00:06 2022 @@ -1200,6 +1200,7 @@ public class SVNClient implements SVNCli * boolean, boolean, int, String)} instead. * @since 1.0 */ + @Deprecated public long doExport(String srcPath, String destPath, Revision revision, boolean force) throws ClientException @@ -1213,6 +1214,7 @@ public class SVNClient implements SVNCli * boolean, boolean, int, String)} instead. * @since 1.2 */ + @Deprecated public long doExport(String srcPath, String destPath, Revision revision, Revision pegRevision, boolean force, boolean ignoreExternals, boolean recurse, @@ -1251,6 +1253,7 @@ public class SVNClient implements SVNCli * instead. * @since 1.0 */ + @Deprecated public long doSwitch(String path, String url, Revision revision, boolean recurse) throws ClientException @@ -1265,6 +1268,7 @@ public class SVNClient implements SVNCli * boolean)} instead. * @since 1.5 */ + @Deprecated public long doSwitch(String path, String url, Revision revision, Revision pegRevision, int depth, boolean depthIsSticky, boolean ignoreExternals, @@ -1359,6 +1363,7 @@ public class SVNClient implements SVNCli * boolean, boolean)} instead. * @since 1.0 */ + @Deprecated public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse) @@ -1374,6 +1379,7 @@ public class SVNClient implements SVNCli * boolean, boolean)} instead. * @since 1.2 */ + @Deprecated public void merge(String path1, Revision revision1, String path2, Revision revision2, String localPath, boolean force, boolean recurse, boolean ignoreAncestry, boolean dryRun)