Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.

Bug 329527

Summary:	Merge sometimes fails with artifact not found on branch error when an artifact has been deleted
Product:	[Technology] OSEE	Reporter:	Mark D-B <mark.db>
Component:	OSEE Application Framework	Assignee:	Project Inbox <osee.framework-inbox>
Status:	NEW ---	QA Contact:
Severity:	critical
Priority:	P3
Version:	0.9.4
Target Milestone:	0.9.5
Hardware:	PC
OS:	Windows XP
See Also:	https://bugs.eclipse.org/bugs/show_bug.cgi?id=328389
Whiteboard:

Description Mark D-B

2010-11-05 06:45:54 EDT

The baseline branch contains artifact K14SX, aka 8774.

The branch being merged to it does not contain this artifact, and the branch was created two months after the artifact. This implies it was deleted, and the owner of the branch remembers doing so.

However, on attempting a merge, we get:

!STACK 1
org.eclipse.osee.framework.core.exception.ArtifactDoesNotExist: ArtifactQueryBuilder: No artifact found with id "8774" on branch "BJc5KDeLDjS1NVZtqCQA"
	at org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQueryBuilder.getOrCheckArtifact(ArtifactQueryBuilder.java:519)
	at org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery.getOrCheckArtifactFromId(ArtifactQuery.java:73)
	at org.eclipse.osee.framework.skynet.core.artifact.search.ArtifactQuery.getArtifactFromId(ArtifactQuery.java:65)
	at org.eclipse.osee.framework.skynet.core.conflict.Conflict.getArtifact(Conflict.java:64)
	at org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict.getObjectId(ArtifactConflict.java:75)
	at org.eclipse.osee.framework.skynet.core.conflict.ArtifactConflict.computeStatus(ArtifactConflict.java:68)
	at org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal.getConflict(ConflictManagerInternal.java:166)
	at org.eclipse.osee.framework.skynet.core.revision.ConflictManagerInternal.getConflictsPerBranch(ConflictManagerInternal.java:153)
	at org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal.getOriginalConflicts(ConflictManagerExternal.java:37)
	at org.eclipse.osee.framework.skynet.core.conflict.ConflictManagerExternal.getRemainingConflicts(ConflictManagerExternal.java:49)
	at org.eclipse.osee.framework.ui.skynet.commandHandlers.branch.commit.CommitHandler.commitBranch(CommitHandler.java:57)
	at org.eclipse.osee.ats.util.AtsBranchManager.commit(AtsBranchManager.java:817)
	at org.eclipse.osee.ats.util.AtsBranchManager.access$2(AtsBranchManager.java:812)
	at org.eclipse.osee.ats.util.AtsBranchManager$AtsCommitJob.run(AtsBranchManager.java:799)
	at org.eclipse.core.internal.jobs.Worker.run(Worker.java:55)
!SUBENTRY 1 OSEE 4 0 2010-11-05 10:21:07.347
!MESSAGE ArtifactQueryBuilder: No artifact found with id "8774" on branch "BJc5KDeLDjS1NVZtqCQA"

Branch "BJc5KDeLDjS1NVZtqCQA" is the merge branch.

I suspect that this bug, and 328389, both relate to updating the database from 0.9.1 to 0.9.4, as they would be pretty fundamental otherwise.