ix
3.3.1 Point/point conflicts (for all operations)........................................................62
3.3.2 Point/range conflicts (for all operations)........................................................63
3.3.3 Range/range conflicts...................................................................................65
3.3.4 Global conflicts ............................................................................................66
3.4 Persistent addressing.............................................................................................68
3.4.1 The basic principle........................................................................................68
3.4.2 The interaction of operation types and addressing structure ............................69
3.4.3 The structure of Palimpsest addresses.............................................................74
3.5 Merging................................................................................................................75
3.6 Summary..............................................................................................................78
Chapter 4: The Palimpsest Model......................................................................................79
4.1 The traditional model of changes ...........................................................................79
4.2 Basic Definitions ...................................................................................................81
4.2.1 Changes and change sets...............................................................................82
4.2.2 The structure of Palimpsest addresses.............................................................82
4.2.3 Consistent change sets and causal ordering ....................................................84
4.3 A-sequences and P-sequences.................................................................................87
4.3.1 P-sequences .................................................................................................88
4.3.2 The P-sequence address ordering ...................................................................88
4.3.3 P-sequence addresses: A’(S) ...........................................................................92
4.3.4 The P-sequence content function C
S ...............................................................93
4.4 Some facts about P-sequences ................................................................................95
4.5 Summary..............................................................................................................98
Chapter 5: Applying and Evaluating the Model................................................................100
5.1 Editing histories and version management ............................................................100
5.1.1 Representing traditional version graphs in Palimpsest ...................................102
5.1.2 Tracking states and persistent addressing.....................................................103
5.2 Distributed implementations ................................................................................106
5.3 Undoing in Palimpsest.........................................................................................107
5.4 Summary............................................................................................................109
Chapter 6: Algorithms for P-sequences ...........................................................................110
6.1 The VTML model..................................................................................................110
6.1.1 Versions and version numbers......................................................................111
3.3.1 Point/point conflicts (for all operations)........................................................62
3.3.2 Point/range conflicts (for all operations)........................................................63
3.3.3 Range/range conflicts...................................................................................65
3.3.4 Global conflicts ............................................................................................66
3.4 Persistent addressing.............................................................................................68
3.4.1 The basic principle........................................................................................68
3.4.2 The interaction of operation types and addressing structure ............................69
3.4.3 The structure of Palimpsest addresses.............................................................74
3.5 Merging................................................................................................................75
3.6 Summary..............................................................................................................78
Chapter 4: The Palimpsest Model......................................................................................79
4.1 The traditional model of changes ...........................................................................79
4.2 Basic Definitions ...................................................................................................81
4.2.1 Changes and change sets...............................................................................82
4.2.2 The structure of Palimpsest addresses.............................................................82
4.2.3 Consistent change sets and causal ordering ....................................................84
4.3 A-sequences and P-sequences.................................................................................87
4.3.1 P-sequences .................................................................................................88
4.3.2 The P-sequence address ordering ...................................................................88
4.3.3 P-sequence addresses: A’(S) ...........................................................................92
4.3.4 The P-sequence content function C
S ...............................................................93
4.4 Some facts about P-sequences ................................................................................95
4.5 Summary..............................................................................................................98
Chapter 5: Applying and Evaluating the Model................................................................100
5.1 Editing histories and version management ............................................................100
5.1.1 Representing traditional version graphs in Palimpsest ...................................102
5.1.2 Tracking states and persistent addressing.....................................................103
5.2 Distributed implementations ................................................................................106
5.3 Undoing in Palimpsest.........................................................................................107
5.4 Summary............................................................................................................109
Chapter 6: Algorithms for P-sequences ...........................................................................110
6.1 The VTML model..................................................................................................110
6.1.1 Versions and version numbers......................................................................111