xt of a source code control system). How and why might a development group end up with a revision tree with multiple branches? What are "3 way merges" and where does the need for these arise?(2 marks) –you employ revision 1.2 in a released product–you have created revision 1.3 as part of work toward next release–you get bug reports on release 1.2–you need to create patched versions so that you can maintain that release, these are separate from work toward new release•Delta–a set of differences between revisions is called a delta–a delta is represented as a set editing commands needed to convert from one revision to the next)3 way merges•Have common “ancestor” file (revision 1.2)•Have two “descendant” files with different changes.•Want a new “descendant” file with combined changes."A class is a module". Comment on the appropriateness of this proposition. (1 mark)•Header file – simply a class declaration•Implementation file ––has to #include header–definitions of member functions–definitions of any static data for class•Disadvantage of this style:–too many separate modules–do you really want:•class Listin List.h, List.cc•class ListLinkin ListLink.h, ListLink.cc•class ListIteratorin ListIterator.h, ListIterator.cc•Classes typically form small groups–get “reused” not completely individually, but as groupsBetter to say a module is a componentA component will most often comprise a group of classes along with any associated free functions Not related •A module is a separately compilable part of a C/C++ program. –two files:"header" file and the "implementation" file. –header: •defines the services that the module provides. –implementation:•the code that is used to supply those services.Explain and illustra...
