[SCM] svnclientadapter packaging branch, master, updated. debian/0.9.100-2-20-g1fe9041

[Jakub Adam]

The following commit has been merged in the master branch:
commit 8e876bdb828259f8b41004ac74d7f023c21662c2
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Thu Oct 11 23:50:53 2012 +0200

    Imported Upstream version 1.8.16

diff --git a/.classpath b/.classpath
index bafd39a..16f727f 100644
--- a/.classpath
+++ b/.classpath
@@ -8,8 +8,8 @@
 	<classpathentry kind="src" output="classes/testcases" path="src/testcases"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="var" path="JUNIT_HOME/junit.jar"/>
-	<classpathentry kind="lib" path="lib/ganymed.jar"/>
-	<classpathentry kind="lib" path="lib/svnkit.jar"/>
 	<classpathentry kind="lib" path="lib/svn-javahl.jar"/>
+	<classpathentry kind="lib" path="lib/svnkit/svnkit-1.7.5-v1.jar"/>
+	<classpathentry kind="lib" path="lib/svnkit/svnkit-javahl16-1.7.5-v1.jar"/>
 	<classpathentry kind="output" path="classes/main"/>
 </classpath>
diff --git a/build.properties b/build.properties
index 6ca229b..de7b639 100644
--- a/build.properties
+++ b/build.properties
@@ -7,11 +7,11 @@
 
 # compile with debug on or off
 debug=on
-targetJvm=1.4
+targetJvm=1.5
 
 # svnClientAdapter version
-svnClientAdapter.buildRev=r2847
-svnClientAdapter.version=0.9.100
+svnClientAdapter.buildRev=r5494
+svnClientAdapter.version=1.7.0
 
 # -----------------------------------------------------------------------------
 # locations for directories
@@ -35,9 +35,9 @@ test.lib.dir=test/lib
 # all jar needed
 # -----------------------------------------------------------------------------
 lib.dir=lib
-svnjavahl.jar=${lib.dir}/svnjavahl.jar
-svnkit.jar=${lib.dir}/svnkit.jar
-ganymed.jar=${lib.dir}/ganymed.jar
+svnjavahl.jar=${lib.dir}/svn-javahl.jar
+svnkit.jar=${lib.dir}/svnkit/svnkit-1.7.5-v1.jar
+svnkitjavahl.jar=${lib.dir}/svnkit/svnkit-javahl16-1.7.5-v1.jar
 
 # -----------------------------------------------------------------------------
 # JavaHL win32 lib dir
diff --git a/build.xml b/build.xml
index 6fb8186..20126dd 100644
--- a/build.xml
+++ b/build.xml
@@ -10,7 +10,7 @@
   <path id="project.classpath">
     <pathelement location="${svnjavahl.jar}"/>
   	<pathelement location="${svnkit.jar}"/>
-  	<pathelement location="${ganymed.jar}"/>
+  	<pathelement location="${svnkitjavahl.jar}"/>
   </path>
 
   <!-- ================================================================= -->
@@ -126,11 +126,10 @@
   	<!-- required libs -->
 	<copy file="${svnjavahl.jar}" todir="${build.distrib.dir}/lib"/>
 	<copy file="${lib.dir}/JAVAHL-LICENSE" todir="${build.distrib.dir}/lib"/>  	
-	<copy file="${svnkit.jar}" todir="${build.distrib.dir}/lib"/>
-	<copy file="${lib.dir}/SVNKit-LICENSE" todir="${build.distrib.dir}/lib"/>  	
-	<copy file="${lib.dir}/SEQUENCE-LICENSE" todir="${build.distrib.dir}/lib"/>
-	<copy file="${ganymed.jar}" todir="${build.distrib.dir}/lib"/>
-	<copy file="${lib.dir}/GANYMED-LICENSE" todir="${build.distrib.dir}/lib"/>
+  	<!-- SVNKit files -->
+    <copy todir="${build.distrib.dir}/lib">
+      <fileset dir="${lib.dir}/svnkit"/>
+    </copy>
   	<!-- Javadoc files -->
     <copy todir="${build.distrib.dir}/javadoc">
       <fileset dir="${build.javadoc.dir}"/>
diff --git a/src/commandline/org/tigris/subversion/svnclientadapter/commandline/CmdLineClientAdapter.java b/src/commandline/org/tigris/subversion/svnclientadapter/commandline/CmdLineClientAdapter.java
index 38c7b00..096c27a 100644
--- a/src/commandline/org/tigris/subversion/svnclientadapter/commandline/CmdLineClientAdapter.java
+++ b/src/commandline/org/tigris/subversion/svnclientadapter/commandline/CmdLineClientAdapter.java
@@ -47,6 +47,7 @@ import org.tigris.subversion.svnclientadapter.ISVNNotifyListener;
 import org.tigris.subversion.svnclientadapter.ISVNProgressListener;
 import org.tigris.subversion.svnclientadapter.ISVNProperty;
 import org.tigris.subversion.svnclientadapter.ISVNStatus;
+import org.tigris.subversion.svnclientadapter.ISVNStatusCallback;
 import org.tigris.subversion.svnclientadapter.SVNBaseDir;
 import org.tigris.subversion.svnclientadapter.SVNClientException;
 import org.tigris.subversion.svnclientadapter.SVNDiffSummary;
@@ -1922,4 +1923,54 @@ public class CmdLineClientAdapter extends AbstractClientAdapter {
 		return null;
 	}
 
+	@Override
+	public String getPostCommitError() {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ISVNStatus[] getStatus(File path, boolean descend, boolean getAll,
+			boolean contactServer, boolean ignoreExternals,
+			ISVNStatusCallback callback) throws SVNClientException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void propertySet(SVNUrl url, Number baseRev, String propertyName,
+			String propertyValue, String message) throws SVNClientException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public ISVNProperty[] getProperties(File path, boolean descend)
+			throws SVNClientException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public ISVNProperty[] getProperties(SVNUrl url, SVNRevision revision,
+			SVNRevision peg, boolean recurse) throws SVNClientException {
+		// TODO Auto-generated method stub
+		return null;
+	}
+
+	@Override
+	public void switchToUrl(File path, SVNUrl url, SVNRevision revision,
+			SVNRevision pegRevision, int depth, boolean setDepth,
+			boolean ignoreExternals, boolean force, boolean ignoreAncestry)
+			throws SVNClientException {
+		// TODO Auto-generated method stub
+		
+	}
+
+	@Override
+	public void upgrade(File dir) throws SVNClientException {
+		// TODO Auto-generated method stub
+		
+	}
+
 }
diff --git a/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlStatus.java b/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlStatus.java
index 3e2ab64..a765871 100644
--- a/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlStatus.java
+++ b/src/javahl/org/tigris/subversion/svnclientadapter/javahl/JhlStatus.java
@@ -63,8 +63,13 @@ public class JhlStatus implements ISVNStatus {
 		// note that status.textStatus must be different than 0 (the resource must exist)
         super();
 		_s = status;
+		
+		// This is a workaround for an SVNKit bug that results in _s.isConflicted == false for an old format
+		// working copy, even if the file is text conflicted.
+		boolean textConflicted = _s.getTextStatus() != null && _s.getTextStatus().equals(Status.Kind.conflicted);
+		
 		try {
-			if (client != null && _s.isConflicted())
+			if (client != null && (_s.isConflicted() || textConflicted))
 				populateInfo(client, _s.getPath());
 		} catch (ClientException e) {
 			// Ignore

-- 
svnclientadapter packaging