[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
Re: [stellation-res] Question about Merging NPE
|
On Wed, 2002-12-25 at 20:21, Jeffrey Howard wrote:
> Hello,
>
> Okay, I see. Last night, when I first tried this merge, I tried it
> with --location postgresql:stellation. When the client threw the NPE,
> I then tried --location remote:localhost:6060:stellation. In the
> latter case, the server threw an NPE. I didn't look closely enough.
> They are, in fact, NPEs in two different places. The one you fixed
> was the one I didn't check just now when testing to see if the fix
> worked. Sorry 'bout that.
>
> So, now that that's straightened out, the change from == to != does
> fix the merge when I use --location remote:localhost:6060:stellation.
> :) Going through the server works just fine now.
Nice to know I got something right. :-) (I'm feeling pretty guilty about
the fact that that "x == null && x." thing not getting caught for
this long! There's be some nice new Junit tests for
nearestCommonAncestor coming soon!)
-Mark
--
Mark Craig Chu-Carroll, IBM T.J. Watson Research Center
*** The Stellation project: Advanced SCM for Collaboration
*** http://www.eclipse.org/stellation
*** Work Email: mcc@xxxxxxxxxxxxxx ------- Personal Email: markcc@xxxxxxxxxxx
