[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
|
[stellation-res] Re: [Bug 21610] New: NullPointerException when merging code
|
Which project, and which checked out version was the basis of the workspace
you're merging into. This sounds like a manifestation of the directory delete
bug which we fixed over the weekend. The way that I fixed the repository
has the limitation that you cannot merge into a workspace based on version
1 of any of the projects.
-Mark
On Monday 15 July 2002 11:54 pm, you wrote:
stella> http://bugs.eclipse.org/bugs/show_bug.cgi?id=21610
>
> Summary: NullPointerException when merging code
> Product: Stellation
> Version: unspecified
> Platform: Other
> OS/Version: Linux
> Status: NEW
> Severity: normal
> Priority: P3
> Component: Repository
> AssignedTo: mcc@xxxxxxxxxxxxxx
> ReportedBy: aying@xxxxxxxxxx
>
>
> A NullPointerException is thrown when merging the main branch to a
> workspace with one newly added file.
>
> To reproduce:
>
> 1. First a file was added to the project:
> svc --location=remote:svc:6060:stellation --username=aying
> --password=aying4you add tests/scm/merge/test6/ra-script.sh
>
> 2. Then a merge is performed:
> svc --location=remote:svc:6060:stellation --username=aying
> --password=aying4 4you merge main
>
> Exception in thread "main" java.lang.NullPointerException
> at
> org.eclipse.stellation.repos.artifact.CompoundArtifact.getNameForArtifactID
>(CompoundArtifact.java:311) at
> org.eclipse.stellation.repos.artifact.CompoundArtifactAgent.merge(CompoundA
>rtifactAgent.java:214) at
> org.eclipse.stellation.repos.MergeManager.mergeChanges(MergeManager.java:20
>1) at
> org.eclipse.stellation.repos.messaging.client.RemoteHandle.realMergeChanges
>(RemoteHandle.java:644) at
> org.eclipse.stellation.repos.messaging.client.RemoteHandle.mergeChanges(Rem
>oteHandle.java:625) at
> org.eclipse.stellation.workspace.Merge.performMerge(Merge.java:138) at
> org.eclipse.stellation.workspace.Merge.command(Merge.java:71) at
> org.eclipse.stellation.workspace.Svc.command(Svc.java:108) at
> org.eclipse.stellation.workspace.Svc.run(Svc.java:540)
> at org.eclipse.stellation.workspace.Svc.main(Svc.java:333)
>
>
>
> ------- You are receiving this mail because: -------
> You are the assignee for the bug, or are watching the assignee.
--
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
