improved intro about evolve
diff --git a/docs/index.rst b/docs/index.rst --- a/docs/index.rst +++ b/docs/index.rst @@ -6,7 +6,7 @@ Safe Mutable History Here are various Materials on planned improvement to mercurial regarding rewriting mutable history. -The effort is splitted in two part: +The effort split in two part: * The **obsolete marker** concept aiming to provide and alternative to strip to get ride of changesets. @@ -23,13 +23,34 @@ concept. For this reason document about Evolve: A robust alternative to MQ ==================================== +Evolve is an experimental history rewriting extensions that use the obsolete +marker. It is inspired from MQ and pbranch but have multiple advantage over +them. -* Using the obsolete marker concept, (see next section for advantage of the - obsolete marker) +* sticks to "Work where you are" philosophy (I'll need better wording + for that) -* provide a more robust alternative for mq covering any usage but guard. +* Handle any kind history. Even history with branch and merge. -..warning:: The evolve extention and the obsolete marker are at an experimental +* Use robust mercurial's merge mechanism + + simple conflict are handled by real merge tools using appropriate ancestor. + Conflict are much rarer and much more user friendly. + +* All mutable history available at the same time + + You are do not need to unapply and apply patche to access various part of you + history. + +* Use plain changeset only. Evole create and exchange real changeset only. + Mutable history can be used in all usual operation 'pull, push, log, diff …) + +* Allow sharing and collaborating mutable history without fear of duplicate. + (thanks to obsolete marker). + +* Cover all mq usage but guard. + +.. warning:: The evolve extention and the obsolete marker are at an experimental stage. While using obsolet you'll likely be exposed to complexe implication of the **obsolete marker** concept. I do not recommend non power user to test this at this stage. @@ -42,7 +63,6 @@ To enable the evolve extension use:: $ mutable-history/enable.sh > ~/.hgrc - .. toctree:: :maxdepth: 1