equal
deleted
inserted
replaced
40 |
40 |
41 - When changeset A is simply "pruned" from the graph, a marker is created: |
41 - When changeset A is simply "pruned" from the graph, a marker is created: |
42 |
42 |
43 (A, ()) |
43 (A, ()) |
44 |
44 |
45 - When changeset A is split into B and C, a single marker are used: |
45 - When changeset A is split into B and C, a single marker is used: |
46 |
46 |
47 (A, (C, C)) |
47 (A, (B, C)) |
48 |
48 |
49 We use a single marker to distinguish the "split" case from the "divergence" |
49 We use a single marker to distinguish the "split" case from the "divergence" |
50 case. If two independent operations rewrite the same changeset A in to A' and |
50 case. If two independent operations rewrite the same changeset A in to A' and |
51 A'', we have an error case: divergent rewriting. We can detect it because |
51 A'', we have an error case: divergent rewriting. We can detect it because |
52 two markers will be created independently: |
52 two markers will be created independently: |