Mercurial > evolve
diff docs/instability.rst @ 574:4f5562c92630 stable
more schema
author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
---|---|
date | Tue, 25 Sep 2012 12:06:48 +0200 |
parents | 9825c7da5b54 |
children | dd5765ae91c3 |
line wrap: on
line diff
--- a/docs/instability.rst Wed Sep 19 15:28:35 2012 +0200 +++ b/docs/instability.rst Tue Sep 25 12:06:48 2012 +0200 @@ -32,9 +32,8 @@ 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. @@ -116,7 +115,7 @@ 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.