Re: [stellation-res] Tentative fix posted on wiki

[Jim Wright - IBM Research <jwright@xxxxxxxxxxxxxx>]

I've resolved the issue with createCatalogElement by:
a) adding an ArtifactMap argument to createCatalogElement
b) restoring (and fixing) CompoundArtifact.createCatalogElement
c) changing BranchImage.getDocument to pass its ArtifactMap when it calls 
rootArtifact.createCatalogElement.

The code now passes all of my everything-but-merge Eclipse JUnit tests.  It 
also passes test 0 of the Ant/CLI tests.  Ant/CLI test 1 is failing, 
somewhere in the merge algorithm.  As before, I'll first fix any merge 
issues in the Eclipse T-Client environment, and then retest and fix the CLI 
as needed.

- Jim

At 12:07 PM 3/19/2004, Jim Wright - IBM Research wrote:
> Mark,
>
> I've been debugging this, and it seems you've removed 
> CompoundArtifact.createCatalogElement.
> As a result, when a project is saved locally, the resulting project.xml 
> document has no children at all (because rootArtifact.createCatalogElement 
> defaults to Artifact.createCatalogElement, which of course assumes it has 
> no children...).
>
> Were you intending to handle this elsewhere?  If so, where (and how)?
> (I've also entered this as a comment on #53123).
>
> - Jim
>
>
> At 08:09 AM 3/18/2004, Mark C Chu-Carroll wrote:
>
> > I posted a zipfile of the tentative fix for the merge bug on the wiki 
> > last night. (I tried to send this notification twice last night, but 
> > Notes, glorious piece of software that it is, managed to bounce it the 
> > first time for no apparent reason, and to crash the second time I tried 
> > to send it!)
> >
> > Anyway - the fix is untested. It needed some API changes, which break the 
> > tests. I decided to make the changes available, so that others can adapt 
> > to the API changes while I'm writing tests.
> >
> >         -Mark
> >
> >
> >
> > Mark Craig Chu-Carroll,  IBM T.J. Watson Research Center
> > *** The Stellation project: Advanced SCM Research
> > ***      http://stellation.eclipse.org
> > *** Work: mcc@xxxxxxxxxxxxxx/Home: markcc@xxxxxxx
>
>
> --------------------------------------------------------------------
> Jim Wright, IBM T.J. Watson Research Center
> *** The Stellation project: Advanced SCM for Collaboration
> *** http://www.eclipse.org/stellation
> *** Work Email: jwright@xxxxxxxxxxxxxx ------- Personal Email: 
> jim.wright@xxxxxxx
>
> _______________________________________________
> stellation-res mailing list
> stellation-res@xxxxxxxxxxx
> http://dev.eclipse.org/mailman/listinfo/stellation-res


--------------------------------------------------------------------
Jim Wright, IBM T.J. Watson Research Center
*** The Stellation project: Advanced SCM for Collaboration
*** http://www.eclipse.org/stellation
*** Work Email: jwright@xxxxxxxxxxxxxx ------- Personal Email: 
jim.wright@xxxxxxx