Author: rhuijben
Date: Sun Jun 5 17:29:09 2011
New Revision: 1132461
URL: http://svn.apache.org/viewvc?rev=1132461&view=rev
Log:
* subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(testBasicInfo2): Expect depth unknown on files via the new api.
* subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
(testBasicInfo2): Expect depth unknown on files via the new api.
* subversion/libsvn_client/deprecated.c
(info_from_info2): Restore old value for the old api, but watch out not to
override excluded.
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
subversion/trunk/subversion/libsvn_client/deprecated.c
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java?rev=1132461&r1=1132460&r2=1132461&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/apache/subversion/javahl/BasicTests.java
Sun Jun 5 17:29:09 2011
@@ -2049,7 +2049,7 @@ public class BasicTests extends SVNTests
-1, info.getReposSize());
// Examine depth
- assertEquals(Depth.infinity, info.getDepth());
+ assertEquals(Depth.unknown, info.getDepth());
}
// Create wc with a depth of Depth.empty
Modified:
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java?rev=1132461&r1=1132460&r2=1132461&view=diff
==============================================================================
---
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
(original)
+++
subversion/trunk/subversion/bindings/javahl/tests/org/tigris/subversion/javahl/BasicTests.java
Sun Jun 5 17:29:09 2011
@@ -2060,7 +2060,7 @@ public class BasicTests extends SVNTests
-1, info.getReposSize());
// Examine depth
- assertEquals(Depth.infinity, info.getDepth());
+ assertEquals(Depth.unknown, info.getDepth());
}
// Create wc with a depth of Depth.empty
Modified: subversion/trunk/subversion/libsvn_client/deprecated.c
URL:
http://svn.apache.org/viewvc/subversion/trunk/subversion/libsvn_client/deprecated.c?rev=1132461&r1=1132460&r2=1132461&view=diff
==============================================================================
--- subversion/trunk/subversion/libsvn_client/deprecated.c (original)
+++ subversion/trunk/subversion/libsvn_client/deprecated.c Sun Jun 5 17:29:09
2011
@@ -2133,6 +2133,9 @@ info_from_info2(svn_info_t **new_info,
info->changelist = info2->wc_info->changelist;
info->depth = info2->wc_info->depth;
+ if (info->depth == svn_depth_unknown && info->kind == svn_node_file)
+ info->depth = svn_depth_infinity;
+
info->working_size64 = info2->wc_info->recorded_size;
if (((apr_size_t)info->working_size64) == info->working_size64)
info->working_size = (apr_size_t)info->working_size64;
