Some Eclipse Foundation services are deprecated, or will be soon. Please ensure you've read this important communication.
Bug 329527 - Merge sometimes fails with artifact not found on branch error when an artifact has been deleted
Summary: Merge sometimes fails with artifact not found on branch error when an artifac...
Status: NEW
Alias: None
Product: OSEE
Classification: Technology
Component: OSEE Application Framework (show other bugs)
Version: 0.9.4   Edit
Hardware: PC Windows XP
: P3 critical (vote)
Target Milestone: 0.9.5   Edit
Assignee: Project Inbox CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2010-11-05 06:45 EDT by Mark D-B CLA
Modified: 2010-11-05 06:47 EDT (History)
0 users

See Also:

Attachments
Add an attachment (proposed patch, testcase, etc.)

Note You need to log in before you can comment on or make changes to this bug.
Description Mark D-B CLA 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.