On Fri, Feb 26, 2010 at 10:54 AM, <l...@apache.org> wrote: > Author: lgo > Date: Fri Feb 26 09:54:15 2010 > New Revision: 916632 > > URL: http://svn.apache.org/viewvc?rev=916632&view=rev > Log: > javahl: clarify the use of parameter kind of getMergeinfoLog. > > * subversion/javahl/SVNClientInterface.java > (getMergeinfoLog): Add some info to the method documentation. > > Modified: > > subversion/trunk/subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java > > 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=916632&r1=916631&r2=916632&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 09:54:15 2010 > @@ -1093,7 +1093,8 @@ > > /** > * Retrieve either merged or eligible-to-be-merged revisions. > - * @param kind kind of revisions to receive > + * @param kind kind of revisions to receive: 1 for > + * merged revisions, any other number for eligible-to-be-merged > revisions.
I now see that on 1.6.9 the allowed values for kind are: 0: eligible revs 1: merged revs (from branches/1.6.x/subversion/bindings/javahl/native/SVNClient.cpp:867) Any other value does nothing, no error, nothing. On trunk, the code has changed to allow 1 for merged revs, and any other value for eligible revs. (from trunk/subversion/bindings/javahl/native/SVNClient.cpp:873) Was that change intentional? Well, there seems to be a MergeinfoLogKind class defining both merged so this commit has to be redone anyway. Lieven
