search

cp-api / req15

0 stars 0 forks source link

Merge of ReqIF elements does not work #65

Closed eclipse-capella-bot closed 3 years ago

eclipse-capella-bot commented 3 years ago

Due to the integration of the new DiffMerge, the merge of ReqIF elements does not work anymore. Analysis: The merge of ReqIF use a read-only target scope. With the new implementation of DiffMerge which is more strict, dependencies of differences in a read-only scope are not taken into account. This leads to the failure of ReqIF merge. The fix consists in using an editable target scope and do a roll-back of modifications if users choose to cancel the merge.

ECLIPSE-555390 POLARSYS-2325 minh.tu.ton.that 2019-01-04 0.10.0

eclipse-capella-bot commented 3 years ago

ci-bot commented on 2019-01-04

Merged to [master]. Commit: 7a2abb812b7d9bad741b62cf2656814c2e898e34

ci-bot commented on 2019-01-07

Merged to [master]. Commit: e079c7969898022f87dae6af902f6a591b22ab02

minh.tu.ton.that commented on 2019-01-08

Bug fixed in master

ghanshyamsinh.devda commented on 2019-01-08

ok