xii
List of Figures
Figure 2.1: A sentence, two edits to it, and two merge results ............................................ 48
Figure 3.1: a set of insertions and deletions changes.......................................................... 60
Figure 3.2: Some move and copy changes and their results ................................................. 68
Figure 6.1: VTML example showing internal changes .........................................................115
Figure 6.2: VTML example showing external changes .........................................................115
Figure 6.3: VTML editor diff window, with corresponding portions highlighted....................116
Figure 6.4: Overlapping deletions and union regions .........................................................123
Figure 6.5: Algorithm for comparing a non-indexed address...............................................128
Figure 6.6: Algorithm for enumerating the contents of a P-sequence..................................131
Figure 6.7: Auxiliary function for processing a segment during enumeration.......................132
Figure 7.1: Global Architecture for Palimpsest applications ................................................138
Figure 7.2: Common operations for the data store .............................................................139
Figure 7.3: Functions for managing a parallel buffer..........................................................144
Figure A.1: Sample change set 1 ......................................................................................153
Figure A.2: Testing a subset of sample set 1 .....................................................................153
Figure A.3: Testing another subset of sample set 1............................................................153
Figure A.4: Testing the full set ........................................................................................154
Figure A.5: An example with a global conflict...................................................................154
Figure A.6: The resolution of the global conflict ...............................................................155
Figure A.7: Listing of Prolog test program ........................................................................156
List of Figures
Figure 2.1: A sentence, two edits to it, and two merge results ............................................ 48
Figure 3.1: a set of insertions and deletions changes.......................................................... 60
Figure 3.2: Some move and copy changes and their results ................................................. 68
Figure 6.1: VTML example showing internal changes .........................................................115
Figure 6.2: VTML example showing external changes .........................................................115
Figure 6.3: VTML editor diff window, with corresponding portions highlighted....................116
Figure 6.4: Overlapping deletions and union regions .........................................................123
Figure 6.5: Algorithm for comparing a non-indexed address...............................................128
Figure 6.6: Algorithm for enumerating the contents of a P-sequence..................................131
Figure 6.7: Auxiliary function for processing a segment during enumeration.......................132
Figure 7.1: Global Architecture for Palimpsest applications ................................................138
Figure 7.2: Common operations for the data store .............................................................139
Figure 7.3: Functions for managing a parallel buffer..........................................................144
Figure A.1: Sample change set 1 ......................................................................................153
Figure A.2: Testing a subset of sample set 1 .....................................................................153
Figure A.3: Testing another subset of sample set 1............................................................153
Figure A.4: Testing the full set ........................................................................................154
Figure A.5: An example with a global conflict...................................................................154
Figure A.6: The resolution of the global conflict ...............................................................155
Figure A.7: Listing of Prolog test program ........................................................................156
