On Tue, 05 Jun 2007, Daniel Rall wrote:
> On Mon, 04 Jun 2007, Hyrum K. Wright wrote:
>
> > Mark Phippard wrote:
> > > Here is a test you can use locally to produce the crash in #1 below.
> > > Just paste it into BasicTests.java.
> > >
> > > /**
> > > * Test the basic functionality of {@link
> > > * org.tigris.subversion.javahl.SVNClientInterface#getMergeInfo(}).
> > > * @throws Throwable
> > > * @since 1.5
> > > */
> > > public void testMergeInfoCrash() throws Throwable
> > > {
> > > OneTest thisTest = new OneTest();
> > > File localPath = new File(thisTest.getWCPath(), "notesWC");
> > > client.checkout("http://svn.collab.net/repos/svn/trunk/notes",
> > > localPath.toString(),
> > > Revision.HEAD, Revision.HEAD, 1, true, true);
> > > MergeInfo mergeInfo =
> > > client.getMergeInfo(localPath.toString(), Revision.HEAD);
> > > System.out.println(mergeInfo.toString());
> > > }
> >
> > I've tracked the problem down to a NULL mergeinfo hash which gets passed
> > back through the get_mergeinfo() apis. The following patch fixes the
> > symptom, but I'm not familiar enough with the purpose of the code to
> > determine if it is correct or not.
> ...
>
> Thanks Hyrum, that was a big help in understanding the problem. We
> recently change the get_mergeinfo() C APIs to return NULL mergeinfo to
> represent "no merge info", and an empty hash to represent "explicitly
> empty merge info on this and child paths". Looks like the JavaHL APIs
> didn't catch up with this yet.
>
> Mark, try this patch, and let me know:
...
The patch did the trick, and was committed in r25307.
It did not fix the second issue pointed out by Mark. However, there's
a good chance that the root cause is similar.
- application/pgp-signature attachment: stored
Received on Tue Jun 5 23:08:38 2007