Commits

Pierre-Yves David  committed 4f5562c

more schema

  • Participants
  • Parent commits dc107ac
  • Branches stable

Comments (0)

Files changed (11)

File docs/figures/edit-is-rewrite-step1.svg

Added
New image

File docs/figures/edit-is-rewrite-step2.svg

Added
New image

File docs/figures/explain-troubles-concurrent-10-solution.svg

Added
New image

File docs/figures/explain-troubles-concurrent-10-sumup.svg

Added
New image

File docs/figures/explain-troubles-latecomer-10-sumup.svg

Added
New image

File docs/figures/explain-troubles-latecomer-15-solution.svg

Added
New image

File docs/figures/explain-troubles-unstable-10-sumup.svg

Added
New image

File docs/figures/explain-troubles-unstable-15-solution.svg

Added
New image

File docs/figures/git.svg

Added
New image

File docs/instability.rst

 changing B content too. This requires the creation of **another**
 changeset, which is semantically good.
 
-::
+.. figure:: ./figures/edit-is-rewrite-step2.svg
 
-  Schema base,  A, B and B'
 
 To avoid duplication, the older changeset is usually discarded from accessible
 history. I'm calling them *obsolete* changesets.
 This allow much more flexible workflow but two major feature are lost in the
 process:
 
-:Graceful merge: MQ use plain-patch to store changeset content and patch have
+:graceful merge: MQ use plain-patch to store changeset content and patch have
                  trouble to apply in changing context. Applying your queue
                  becomes very painful when context changes.
 

File docs/obs-concept.rst

 *meaningful*.
 
 
-.. warning:: add a schema::
+.. figure:: ./figures/git.*
 
-        C
-        | B---<foo>
-        |/
-        |
-        A
-
-    Only B and A are visible.
 
 This simplifies the process of getting rid of old changesets. You can
 just leave them in place and move the reference on the new one. You
 will keep the same parent than `A'` and `A''` with two obsolete
 markers pointing to both `A` and `A'`
 
-.. warning::  TODO: Add a schema of the resolution. (merge A' and A'' with A as
-              ancestor and graft the result of A^)
+.. figure:: ./figures/explain-troubles-concurrent-10-solution.*
 
 Allowing multiple new changesets to obsolete a single one allows to
 distinguish a split changeset from a history rewriting conflict.
 * *newer* version of a public changeset are called **latecomer** and
   highlighted as an error case.
 
+.. figure:: ./figures/explain-troubles-concurrent-10-sumup.*
+
 Solving such an error is easy. Because we know what changeset a
 *latecomer* tries to rewrite, we can easily compute a smaller
 changeset containing only the change from the old *public* to the new
 *latecomer*.
 
-.. warning:: add a schema
+.. figure:: ./figures/explain-troubles-concurrent-15-solution.*
 
 
 Conclusion