Bug 156026 - JMerge can't see annotations
Summary: JMerge can't see annotations
Status: RESOLVED DUPLICATE of bug 124372
Alias: None
Product: EMF
Classification: Modeling
Component: Tools (show other bugs)
Version: 2.2   Edit
Hardware: PC Windows XP
: P3 enhancement (vote)
Target Milestone: ---   Edit
Assignee: Dave Steinberg CLA
QA Contact:
URL:
Whiteboard:
Keywords:
Depends on:
Blocks:
 
Reported: 2006-09-01 22:44 EDT by Alain Picard CLA
Modified: 2006-09-02 08:59 EDT (History)
1 user (show)

See Also:


Attachments

Note You need to log in before you can comment on or make changes to this bug.
Description Alain Picard CLA 2006-09-01 22:44:05 EDT
One of the operation that we are doing involves adding new annotations to code and using JMerge to propagate these and other changes.

Whenever we only change the annotation, there is no functionality in JMerge to allow us to test for those changes.

Furthermore, these annotations are attached to what is referred to as "Unmodifiable" code that is owned by the generator. Another problem is that there doesn't seem to be a way to force replace any section of code. This would allow us to get around this issue. Maybe for others, this would be done in order to format the code differently.

Even if from the test examples we can see this (our rule is based directly on this):
    <!-- force transfer of all unmodifiable elements -->
    <merge:pull 
      sourceMarkup="^unmod$"
      sourceGet="Member/getFlags"
      targetPut="Member/setFlags"/>
to force a transfer, it doesn't really force a transfer, it only makes sure that a transfer will take place if the code doesn't exist in the destination.
Comment 1 Ed Merks CLA 2006-09-02 08:59:12 EDT
Everything to do with Java 5.0 syntax will be addressed when we complete the AST-based merger in the next development cycle. I'm assuming by annotation that's what you mean...

*** This bug has been marked as a duplicate of 124372 ***