You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by lg...@apache.org on 2010/02/26 14:12:39 UTC
svn commit: r916667 - in
/subversion/trunk/subversion/bindings/javahl/src/org:
apache/subversion/javahl/MergeinfoLogKind.java
tigris/subversion/javahl/MergeinfoLogKind.java
tigris/subversion/javahl/SVNClientInterface.java
Author: lgo
Date: Fri Feb 26 13:12:39 2010
New Revision: 916667
URL: http://svn.apache.org/viewvc?rev=916667&view=rev
Log:
Follow up r916632: Improve documentation.
*
subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind
.java
*
subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind
.java
(eligible, merged): Fixed doc strings.
*
subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterfa
ce.java
(getMergeinfoLog): Refer to MergeinfoLogKind for kind parameter.
Modified:
subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java
subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
Modified: subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java?rev=916667&r1=916666&r2=916667&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/apache/subversion/javahl/MergeinfoLogKind.java Fri Feb 26 13:12:39 2010
@@ -24,13 +24,14 @@
package org.apache.subversion.javahl;
/**
- * class for kind of mergeinfo logs
+ * Constants to specify which collection of revisions to report in
+ * getMergeinfoLog.
*/
public interface MergeinfoLogKind
{
- /** does not exist */
+ /** Revisions eligible for merging from merge-source to merge-target. */
public static final int eligible = 0;
- /** exists, but uninteresting */
+ /** Revisions already merged from merge-source to merge-target. */
public static final int merged = 1;
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java?rev=916667&r1=916666&r2=916667&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/MergeinfoLogKind.java Fri Feb 26 13:12:39 2010
@@ -24,13 +24,14 @@
package org.tigris.subversion.javahl;
/**
- * class for kind of mergeinfo logs
+ * Constants to specify which collection of revisions to report in
+ * getMergeinfoLog.
*/
public interface MergeinfoLogKind
{
- /** does not exist */
+ /** Revisions eligible for merging from merge-source to merge-target. */
public static final int eligible = 0;
- /** exists, but uninteresting */
+ /** Revisions already merged from merge-source to merge-target. */
public static final int merged = 1;
}
Modified: subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java
URL: http://svn.apache.org/viewvc/subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java?rev=916667&r1=916666&r2=916667&view=diff
==============================================================================
--- subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java (original)
+++ subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java Fri Feb 26 13:12:39 2010
@@ -1093,8 +1093,8 @@
/**
* Retrieve either merged or eligible-to-be-merged revisions.
- * @param kind kind of revisions to receive: 1 for
- * merged revisions, any other number for eligible-to-be-merged revisions.
+ * @param kind kind of revisions to receive:
+ * See {@see org.apache.subversion.javahl.MergeinfoLogKind}.
* @param pathOrUrl target of merge
* @param pegRevision peg rev for pathOrUrl
* @param mergeSourceUrl the source of the merge
@@ -1114,8 +1114,8 @@
/**
* Retrieve either merged or eligible-to-be-merged revisions.
- * @param kind kind of revisions to receive: 1 for
- * merged revisions, any other number for eligible-to-be-merged revisions.
+ * @param kind kind of revisions to receive:
+ * See {@see org.apache.subversion.javahl.MergeinfoLogKind}.
* @param pathOrUrl target of merge
* @param pegRevision peg rev for pathOrUrl
* @param mergeSourceUrl the source of the merge