Faculty of Information Technology
Software Engineering Group

Opened 6 years ago

#19 new defect

Merging in ChangeSetDiffTool is broken

Reported by: Jan Vrany Owned by:
Priority: major Milestone:
Component: default Keywords:
Cc: Also affects CVS HEAD (eXept version): no

Description

Sometimes, after merging changes and saving result, output file still
contains <conflict> lines.

Steps to reproduce:

  1. Download attached files (Object.*), save them into a directory, say /tmp/mergebug
  2. In workspace, evaluate:
| spec |

spec :=  Tools::ChangeSetDiffInfo 
        specA: (Tools::ChangeSetSpec file: '/tmp/mergebug/Object.st.local')
        specB: (Tools::ChangeSetSpec file: '/tmp/mergebug/Object.st.other')
        specBase: (Tools::ChangeSetSpec file: '/tmp/mergebug/Object.st.base')
        specMerge: (Tools::ChangeSetSpec file: '/tmp/mergebug/Object.st').  

Tools::ChangeSetDiffTool new
    open;
    fileMenuOpenOnDiffInfo: spec
                                    
  1. Merge all differences by using version B (using yellow B button in the middle bar on right.
  2. Click Save

Now check that resulting Object.st does not contain any lines
like <conflict>

Attachments (4)

Object.st (289.2 KB) - added by Jan Vrany 6 years ago.
Object.st.base (260.4 KB) - added by Jan Vrany 6 years ago.
Object.st.local (289.4 KB) - added by Jan Vrany 6 years ago.
Object.st.other (260.4 KB) - added by Jan Vrany 6 years ago.

Download all attachments as: .zip

Change History (4)

Changed 6 years ago by Jan Vrany

Attachment: Object.st added

Changed 6 years ago by Jan Vrany

Attachment: Object.st.base added

Changed 6 years ago by Jan Vrany

Attachment: Object.st.local added

Changed 6 years ago by Jan Vrany

Attachment: Object.st.other added
Note: See TracTickets for help on using tickets.