Re: [stellation-res] Question about Merging NPE

["Mark C. Chu-Carroll" <mcc@xxxxxxxxxxxxxx>]

On Wed, 2002-12-25 at 15:59, Jeffrey Howard wrote:
> On Wed, Dec 25, 2002 at 09:57:05AM +0000, Mark C. Chu-Carroll wrote:
> 
> > You've almost certainly found an edge case that my nearestCommonAncestor
> > code doesn't cover. One thing that I'd like, just to make sure, is to
> > see the sequence of commands your using to checkout, branch, checkin
> > changes, and do the merge.
> > 
> > 	-Mark
> 
> Right.  The first time I ran across this, the branches, adds, and
> checkins were all done by the Eclipse client.  I was only using the
> command line client for the merge.  I started over with a new test
> project using only the command line client.  All of these commands
> were given with the options: "--location postgresql:stellation -u
> jhoward -p password"
> 
> svc create testproject
> svc co testproject
> svc fork jhoward-sandbox
> echo testfile > testfile
> svc add testfile
> svc checkin
> svc -r main co testproject
> svc merge jhoward-sandbox
> 
> At the final merge command I get the NPE thrown from within the NCA
> method.

Ok. That's pretty much what I expected. I really hate the NCA code -
it's surprisingly tricky to get right. I'll get right on it.

	-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