You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by pb...@apache.org on 2010/11/16 15:31:06 UTC
svn commit: r1035642 - in /subversion/branches/issue-3668-3669: ./
subversion/bindings/javahl/native/
subversion/bindings/javahl/src/org/apache/subversion/javahl/
subversion/bindings/javahl/src/org/apache/subversion/javahl/type/
subversion/bindings/jav...
Author: pburba
Date: Tue Nov 16 14:31:05 2010
New Revision: 1035642
URL: http://svn.apache.org/viewvc?rev=1035642&view=rev
Log:
On the issue-3668-3669 branch: Sync with ^/subversion/trunk.
Added:
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/NodeKind.java
- copied unchanged from r1035640, subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/type/NodeKind.java
Removed:
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/NodeKind.java
Modified:
subversion/branches/issue-3668-3669/ (props changed)
subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/CreateJ.cpp
subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/EnumMapper.cpp
subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/ListCallback.cpp
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
subversion/branches/issue-3668-3669/subversion/libsvn_wc/entries.c
subversion/branches/issue-3668-3669/subversion/libsvn_wc/workqueue.c
Propchange: subversion/branches/issue-3668-3669/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Nov 16 14:31:05 2010
@@ -39,4 +39,4 @@
/subversion/branches/tc_url_rev:874351-874483
/subversion/branches/tree-conflicts:868291-873154
/subversion/branches/tree-conflicts-notify:873926-874008
-/subversion/trunk:1031000-1035394
+/subversion/trunk:1031000-1035640
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/CreateJ.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/CreateJ.cpp?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/CreateJ.cpp (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/CreateJ.cpp Tue Nov 16 14:31:05 2010
@@ -60,7 +60,7 @@ CreateJ::ConflictDescriptor(const svn_wc
{
ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Kind;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/type/NodeKind;"
"Ljava/lang/String;ZLjava/lang/String;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Action;"
"L"JAVA_PACKAGE"/ConflictDescriptor$Reason;"
@@ -152,7 +152,8 @@ CreateJ::ConflictVersion(const svn_wc_co
{
ctor = env->GetMethodID(clazz, "<init>", "(Ljava/lang/String;J"
"Ljava/lang/String;"
- "L"JAVA_PACKAGE"/NodeKind;)V");
+ "L"JAVA_PACKAGE"/type/NodeKind;"
+ ")V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN_NULL;
}
@@ -196,7 +197,7 @@ CreateJ::Info(const char *path, const sv
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;J"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/type/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;"
"JJLjava/lang/String;"
"L"JAVA_PACKAGE"/Lock;Z"
@@ -376,7 +377,7 @@ CreateJ::ChangedPath(const char *path, s
"<init>",
"(Ljava/lang/String;JLjava/lang/String;"
"L"JAVA_PACKAGE"/ChangePath$Action;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/type/NodeKind;"
"L"JAVA_PACKAGE"/Tristate;"
"L"JAVA_PACKAGE"/Tristate;)V");
if (JNIUtil::isJavaExceptionThrown())
@@ -431,7 +432,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
{
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/type/NodeKind;"
"JJJLjava/lang/String;"
"L"JAVA_PACKAGE"/Status$Kind;"
"L"JAVA_PACKAGE"/Status$Kind;"
@@ -443,7 +444,7 @@ CreateJ::Status(svn_wc_context_t *wc_ctx
"JZZLjava/lang/String;Ljava/lang/String;"
"Ljava/lang/String;"
"JL"JAVA_PACKAGE"/Lock;"
- "JJL"JAVA_PACKAGE"/NodeKind;"
+ "JJL"JAVA_PACKAGE"/type/NodeKind;"
"Ljava/lang/String;Ljava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
@@ -696,7 +697,8 @@ CreateJ::ClientNotifyInformation(const s
midCT = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
"L"JAVA_PACKAGE"/ClientNotifyInformation$Action;"
- "L"JAVA_PACKAGE"/NodeKind;Ljava/lang/String;"
+ "L"JAVA_PACKAGE"/type/NodeKind;"
+ "Ljava/lang/String;"
"L"JAVA_PACKAGE"/Lock;"
"Ljava/lang/String;"
"L"JAVA_PACKAGE"/ClientNotifyInformation$Status;"
@@ -874,7 +876,7 @@ CreateJ::CommitItem(svn_client_commit_it
{
midConstructor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/type/NodeKind;"
"ILjava/lang/String;"
"Ljava/lang/String;J)V");
if (JNIUtil::isExceptionThrown())
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/DiffSummaryReceiver.cpp Tue Nov 16 14:31:05 2010
@@ -91,7 +91,7 @@ DiffSummaryReceiver::onSummary(const svn
ctor = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;"
"L"JAVA_PACKAGE"/DiffSummary$DiffKind;Z"
- "L"JAVA_PACKAGE"/NodeKind;)V");
+ "L"JAVA_PACKAGE"/type/NodeKind;)V");
if (JNIUtil::isJavaExceptionThrown() || ctor == 0)
POP_AND_RETURN(SVN_NO_ERROR);
}
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/EnumMapper.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/EnumMapper.cpp?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/EnumMapper.cpp (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/EnumMapper.cpp Tue Nov 16 14:31:05 2010
@@ -114,7 +114,7 @@ jobject EnumMapper::mapReposNotifyAction
jobject EnumMapper::mapNodeKind(svn_node_kind_t nodeKind)
{
// We're assuming a valid value for the C enum above
- return mapEnum(JAVA_PACKAGE"/NodeKind", (int) nodeKind);
+ return mapEnum(JAVA_PACKAGE"/type/NodeKind", (int) nodeKind);
}
/**
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/ListCallback.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/ListCallback.cpp?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/ListCallback.cpp (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/native/ListCallback.cpp Tue Nov 16 14:31:05 2010
@@ -140,7 +140,7 @@ ListCallback::createJavaDirEntry(const c
{
mid = env->GetMethodID(clazz, "<init>",
"(Ljava/lang/String;Ljava/lang/String;"
- "L"JAVA_PACKAGE"/NodeKind;"
+ "L"JAVA_PACKAGE"/type/NodeKind;"
"JZJJLjava/lang/String;)V");
if (JNIUtil::isJavaExceptionThrown())
POP_AND_RETURN_NULL;
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ChangePath.java Tue Nov 16 14:31:05 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.type.NodeKind;
+
public class ChangePath implements java.io.Serializable
{
// Update the serialVersionUID when there is a incompatible change
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ClientNotifyInformation.java Tue Nov 16 14:31:05 2010
@@ -26,6 +26,7 @@ package org.apache.subversion.javahl;
import java.util.Map;
import java.util.EventObject;
import org.apache.subversion.javahl.callback.ClientNotifyCallback;
+import org.apache.subversion.javahl.type.NodeKind;
/**
* The event passed to the {@link ClientNotifyCallback#onNotify}
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/CommitItem.java Tue Nov 16 14:31:05 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.type.NodeKind;
+
/**
* This class describes a item which will be commited.
*/
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictDescriptor.java Tue Nov 16 14:31:05 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.type.NodeKind;
+
/**
* The description of a merge conflict, encountered during
* merge/update/switch operations.
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/ConflictVersion.java Tue Nov 16 14:31:05 2010
@@ -23,6 +23,8 @@
package org.apache.subversion.javahl;
+import org.apache.subversion.javahl.type.NodeKind;
+
/**
* The description of a merge conflict, encountered during
* merge/update/switch operations.
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DiffSummary.java Tue Nov 16 14:31:05 2010
@@ -25,6 +25,7 @@ package org.apache.subversion.javahl;
import java.util.EventObject;
import org.apache.subversion.javahl.callback.DiffSummaryCallback;
+import org.apache.subversion.javahl.type.NodeKind;
/**
* The event passed to the {@link DiffSummaryCallback#onSummary} API
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/DirEntry.java Tue Nov 16 14:31:05 2010
@@ -25,6 +25,8 @@ package org.apache.subversion.javahl;
import java.util.Date;
+import org.apache.subversion.javahl.type.NodeKind;
+
/**
* A general subversion directory entry. Used for {@link ISVNClient#list}.
*/
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Info.java Tue Nov 16 14:31:05 2010
@@ -25,6 +25,8 @@ package org.apache.subversion.javahl;
import java.util.Date;
+import org.apache.subversion.javahl.type.NodeKind;
+
/**
* this class is returned by {@link ISVNClient#info2} and contains information
* about items in the repository or working copy
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/apache/subversion/javahl/Status.java Tue Nov 16 14:31:05 2010
@@ -25,6 +25,8 @@ package org.apache.subversion.javahl;
import java.util.Date;
+import org.apache.subversion.javahl.type.NodeKind;
+
/**
* Subversion status API.
* This describes the status of one subversion item (file or directory) in
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/src/org/tigris/subversion/javahl/NodeKind.java Tue Nov 16 14:31:05 2010
@@ -61,7 +61,7 @@ public final class NodeKind
return statusNames[kind];
}
- public static int fromApache(org.apache.subversion.javahl.NodeKind aKind)
+ public static int fromApache(org.apache.subversion.javahl.type.NodeKind aKind)
{
switch(aKind)
{
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/SVNTests.java Tue Nov 16 14:31:05 2010
@@ -23,6 +23,7 @@
package org.apache.subversion.javahl;
import org.apache.subversion.javahl.callback.*;
+import org.apache.subversion.javahl.type.NodeKind;
import java.io.File;
import java.io.FileInputStream;
Modified: subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java (original)
+++ subversion/branches/issue-3668-3669/subversion/bindings/javahl/tests/org/apache/subversion/javahl/WC.java Tue Nov 16 14:31:05 2010
@@ -32,6 +32,8 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Date;
+import org.apache.subversion.javahl.type.NodeKind;
+
import junit.framework.Assert;
/**
* This class describe the expected state of the working copy
Modified: subversion/branches/issue-3668-3669/subversion/libsvn_wc/entries.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/libsvn_wc/entries.c?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/libsvn_wc/entries.c (original)
+++ subversion/branches/issue-3668-3669/subversion/libsvn_wc/entries.c Tue Nov 16 14:31:05 2010
@@ -1722,12 +1722,10 @@ write_entry(svn_wc__db_t *db,
svn_sqlite__db_t *sdb,
apr_int64_t wc_id,
apr_int64_t repos_id,
- const char *repos_root,
const svn_wc_entry_t *entry,
const char *local_relpath,
const char *entry_abspath,
const svn_wc_entry_t *this_dir,
- svn_boolean_t always_create_actual,
svn_boolean_t create_locks,
apr_pool_t *scratch_pool)
{
@@ -1790,7 +1788,7 @@ write_entry(svn_wc__db_t *db,
const char *relative_url;
working_node->copyfrom_repos_id = repos_id;
- relative_url = svn_uri_is_child(repos_root, entry->copyfrom_url,
+ relative_url = svn_uri_is_child(this_dir->repos, entry->copyfrom_url,
NULL);
if (relative_url == NULL)
working_node->copyfrom_repos_path = "";
@@ -1958,14 +1956,14 @@ write_entry(svn_wc__db_t *db,
SVN_ERR(svn_checksum_parse_hex(&base_node->checksum, svn_checksum_md5,
entry->checksum, scratch_pool));
- if (repos_root)
+ if (this_dir->repos)
{
base_node->repos_id = repos_id;
/* repos_relpath is NOT a URI. decode as appropriate. */
if (entry->url != NULL)
{
- const char *relative_url = svn_uri_is_child(repos_root,
+ const char *relative_url = svn_uri_is_child(this_dir->repos,
entry->url,
scratch_pool);
@@ -1977,7 +1975,7 @@ write_entry(svn_wc__db_t *db,
}
else
{
- const char *base_path = svn_uri_is_child(repos_root,
+ const char *base_path = svn_uri_is_child(this_dir->repos,
this_dir->url,
scratch_pool);
if (base_path == NULL)
@@ -2128,7 +2126,7 @@ write_entry(svn_wc__db_t *db,
}
/* Insert the actual node. */
- if (actual_node || always_create_actual)
+ if (actual_node)
{
actual_node = MAYBE_ALLOC(actual_node, scratch_pool);
@@ -2166,7 +2164,7 @@ entries_write_new_cb(void *baton,
const svn_wc_entry_t *this_dir;
apr_hash_index_t *hi;
apr_pool_t *iterpool = svn_pool_create(scratch_pool);
- const char *repos_root, *old_root_abspath, *dir_relpath;
+ const char *old_root_abspath, *dir_relpath;
/* Get a copy of the "this dir" entry for comparison purposes. */
this_dir = apr_hash_get(ewb->entries, SVN_WC_ENTRY_THIS_DIR,
@@ -2178,8 +2176,6 @@ entries_write_new_cb(void *baton,
_("No default entry in directory '%s'"),
svn_dirent_local_style(dir_abspath,
iterpool));
- repos_root = this_dir->repos;
-
old_root_abspath = svn_dirent_get_longest_ancestor(dir_abspath,
new_root_abspath,
scratch_pool);
@@ -2189,12 +2185,12 @@ entries_write_new_cb(void *baton,
dir_relpath = svn_dirent_skip_ancestor(old_root_abspath, dir_abspath);
/* Write out "this dir" */
- SVN_ERR(write_entry(db, sdb, ewb->wc_id, ewb->repos_id, repos_root,
+ SVN_ERR(write_entry(db, sdb, ewb->wc_id, ewb->repos_id,
this_dir,
dir_relpath,
svn_dirent_join(new_root_abspath, dir_relpath,
scratch_pool),
- this_dir, FALSE, FALSE, iterpool));
+ this_dir, FALSE, iterpool));
for (hi = apr_hash_first(scratch_pool, ewb->entries); hi;
hi = apr_hash_next(hi))
@@ -2213,13 +2209,13 @@ entries_write_new_cb(void *baton,
use this function for upgrading old working copies. */
child_abspath = svn_dirent_join(dir_abspath, name, iterpool);
child_relpath = svn_dirent_skip_ancestor(old_root_abspath, child_abspath);
- SVN_ERR(write_entry(db, sdb, ewb->wc_id, ewb->repos_id, repos_root,
+ SVN_ERR(write_entry(db, sdb, ewb->wc_id, ewb->repos_id,
this_entry,
child_relpath,
svn_dirent_join(new_root_abspath, child_relpath,
scratch_pool),
this_dir,
- FALSE, TRUE,
+ TRUE,
iterpool));
}
Modified: subversion/branches/issue-3668-3669/subversion/libsvn_wc/workqueue.c
URL: http://svn.apache.org/viewvc/subversion/branches/issue-3668-3669/subversion/libsvn_wc/workqueue.c?rev=1035642&r1=1035641&r2=1035642&view=diff
==============================================================================
--- subversion/branches/issue-3668-3669/subversion/libsvn_wc/workqueue.c (original)
+++ subversion/branches/issue-3668-3669/subversion/libsvn_wc/workqueue.c Tue Nov 16 14:31:05 2010
@@ -2235,7 +2235,6 @@ svn_wc__wq_run(svn_wc__db_t *db,
while (TRUE)
{
- svn_wc__db_kind_t kind;
apr_uint64_t id;
svn_skel_t *work_item;