DSM can thus support a much greater range of variants and
expresses the variants in the simplest way for the modelers.
Even in the worst case, the branching is relatively painless: shallow copies are
made of the relevant models, all referring to the exact same elements as before. The
elements that must be changed are replaced individually by new elements (perhaps
shallow copies for minor changes). A new top-level con?¬?guration model brings
together the set of models needed for the variant. The variants are thus made explicit in
the models and the coherent view of the project includes these variants, rather than
only ever seeing one variant at a time. This broader view helps keep variants working
when changes are made elsewhere, and also makes it easier to spot ways in which this
method of handling variants could be improved towards one that requires less work.
MODEL VERSIONING 405
15.3.3 But How Do I Merge Parallel Changes Made to the Same Model?
Deciding on the boundaries between ?¬?les is an important task in code-based version
control. The project architect will try to avoid the situation where the same ?¬?le
contains parts that will be worked on by multiple people. Always, however, cases
like this will occur, even if the version control system uses some kind of locking to
prevent them. Since the ?¬?les are just text, developers can move them around and
access old copies outside of version control.
Pages:
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784