| Tom Mens. A state-of-the-art survey on software merging. IEEE Trans. Software Engineering, 28(5):449--462, May 2002. |
.... approach, multiple developers can change the same artifacts at the same time (perhaps on branches [37] or alternatively using independent change sets [39] Conflicts may then arise, but semi automated differencing and merging tools help in identifying and resolving them (albeit only a subset [26]) Both approaches rely on workspaces to partition the work of developers. While these workspaces are essential to shield developers from the effects of other changes in other workspaces (good isolation) they have the unfortunate side effect of creating a barrier that prevents developers from ....
T. Mens, A State-of-the-Art Survey on Software Merging. IEEE Transactions on Software Engineering, 2002. 28(5): p. 449-462.
....have actual content in addition to containment information and (b) explicitly distinguish baselines from changes. 3.1.3 Locking constraint module The mechanisms that different configuration management policies use for concurrency control vary. Some are optimistic and rely on automated merging [7] for conflict resolution. Others are pessimistic and rely on locking to avoid conflicts altogether. In terms of persistent state that must be preserved over some timeframe, locks are the only entities that must be stored. Therefore, concurrency related decisions are made by a concurrency action ....
T. Mens, A State-of-the-Art Survey on Software Merging. IEEE Transactions on Software Engineering, 2002. 28(5): p. 449-462.
No context found.
Tom Mens. A state-of-the-art survey on software merging. IEEE Trans. Software Engineering, 28(5):449--462, May 2002.
No context found.
Mens, T., A state-of-the-art survey on software merging, IEEE Trans. Software Engineering 28(5) (2002), pp. 449--462.
No context found.
T. Mens. A state-of-the-art survey on software merging. Transactions on Software Engineering, 28(5):449--462, May 2002.
No context found.
T. Mens, "A State-of-the-Art Survey on Software Merging," Submitted to IEEE Trans. Softw. Eng., March 2000.
....case, all persons that change the data in parallel work on a di#erent copy. Because the data is not shared anymore, we can have convergent changes or divergent changes (see Fig. 3) With convergent changes, parallel versions can be merged or integrated together into a new combined version [29]. For divergent changes, di#erent versions of the system co exist indefinitely as part of the maintenance process. This is, for example, the case in framework based software development, where di#erent invasive customizations of an application framework, i.e. destructive changes directly applied ....
T. Mens. A state-of-the-art survey on software merging. Transactions on Software Engineering, 28(5):449--462, May 2002.
....of the same application are created in this way, and we would of course like to merge the changes of both versions into one single application. Such merging 6 can lead to a number of merge conflicts, which need to be resolved in order to ensure the correct behavior of the resulting application [9]. 3.3.1 An Example Merge Conflict As an example, consider the situation depicted in Figure 3. One developer invokes the addConcreteElement transformation to add the ScQuoteExpression class to the current version of the design pattern instance (upper part of the figure) At the same time, another ....
....application can be logged. By automatically comparing the di#erent transformations that were applied, possible merge conflicts can be detected and reported to the developer, who should then take appropriate action. This is achieved by defining an operation based merge conflict detection algorithm [9], that mutually compares the transformations and defines the conditions under which they can possibly lead to a conflict. The conflict presented above can be detected by means of the following logic rule, for example: ....
Tom Mens. A State-of-the-Art Survey on Software Merging. Transactions on Software Engineering, 28(5), May 2002.
....all such changes should be merged into one single version. However, changes made by one developer may rely on assumptions that are broken by changes made by another developer. When merging such conflicting changes, the resulting version of the framework will be inconsistent and may contain errors [Men02] In this dissertation, we will tackle the above problems and seek to alleviate them, by providing automated support for framework based development. This is expressed in our thesis statement: 11 provided by explicitly documenting a framework s design in a formal way. Framework based software ....
....Such a situation should be avoided, as it leads to a proliferation of di#erent versions of the framework that can quickly become unmanageable [CDHSV97] To overcome this problem, the di#erent versions of the framework should be merged into one single version (see Figure 2. 1) SLMD96, Men99, Men02] Software merging is a time consuming, complicated and error prone process, because many interconnected elements are involved and because merging depends on both the syntax and the semantics of these elements. Moreover, merge conflicts may occur, due to the fact that parallel changes may ....
[Article contains additional citation context not shown here]
Tom Mens. A State-of-the-Art Survey on Software Merging. Transactions on Software Engineering, 28(5), May 2002.
No context found.
T. Mens, "A state-of-the-art survey on software merging, " IEEE Transactions on Software Engineering, vol. 28, pp. 449--462, May 2002.
No context found.
Mens, T.: A state-of-the-art survey on software merging. IEEE Trans. Software Eng. 28 (2002) 449--462
No context found.
T. Mens, "A state-of-the-art survey on software merging," IEEE Transactions on Software Engineering, vol. 28, no. 5, pp. 449--462, May 2002.
No context found.
T. Mens, "A state-of-the-art survey on software merging, " IEEE Transactions on Software Engineering, vol. 28, pp. 449--462, May 2002.
No context found.
Mens, T., A State-of-the-Art Survey on Software Merging. IEEE Transactions on Software Engineering, 2002. 28(5): p. 449-462.
Online articles have much greater impact More about CiteSeer.IST Add search form to your site Submit documents Feedback
CiteSeer.IST - Copyright Penn State and NEC