Mercurial > evolve
changeset 1287:6f2c1574eda8 stable
docs: fix slightly unconventional .rst markup
| author | Greg Ward <greg@gerg.ca> |
|---|---|
| date | Thu, 23 Apr 2015 21:05:54 -0400 |
| parents | d6a77e8f7d5c |
| children | c3ecf6871872 |
| files | docs/evolve-faq.rst docs/evolve-good-practice.rst docs/from-mq.rst docs/obs-terms.rst |
| diffstat | 4 files changed, 45 insertions(+), 45 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/evolve-faq.rst Thu Apr 23 09:03:08 2015 -0400 +++ b/docs/evolve-faq.rst Thu Apr 23 21:05:54 2015 -0400 @@ -1,19 +1,19 @@ .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> .. Logilab SA <contact@logilab.fr> ---------------------------------------------------------------------- +------------- Evolve How To ---------------------------------------------------------------------- +------------- Add a changeset: ``commit`` ------------------------------------------------------------- +--------------------------- Just use commit as usual. New changesets will be in the `draft` phase. Rewrite a changeset: ``commit --amend`` ------------------------------------------------------------- +--------------------------------------- It writes a new changeset combining working-directory parent changes and parent. It will work on any `draft` or `secret` changeset. It will not work on `public` @@ -36,7 +36,7 @@ Move a changeset: ``grab`` ------------------------------------------------------------- +-------------------------- You can use ``hg grab <rev>`` to move a rev at your current location, making the old version obsolete. @@ -45,7 +45,7 @@ Delete a changeset: ``prune`` ------------------------------------------------------------- +----------------------------- A new ``prune`` command allows removing a changeset. @@ -53,7 +53,7 @@ Moving within the history: ``gdown`` and ``gup`` ------------------------------------------------------------- +------------------------------------------------ While working on mutable part of the history you often need to move between mutable commits. @@ -67,7 +67,7 @@ feeling back. Collapse changesets: ``fold`` ------------------------------------------------------------- +----------------------------- You can use ``hg fold`` to collapse multiple changesets in a single one. @@ -78,7 +78,7 @@ ``hg fold -r <revset>`` fold everything changeset matching the revset together. Getting changes out of a commit ------------------------------------------------------------- +------------------------------- The ``hg uncommit`` command lets you rewrite the parent commit without selected changed files. Target files content is not altered and @@ -94,7 +94,7 @@ M celestine Split a changeset ------------------------ +----------------- To split on file boundaries, just use ``uncommit`` command. @@ -120,7 +120,7 @@ Update my current work in progress after a pull ----------------------------------------------- +----------------------------------------------- Whenever you are working on some changesets, it is more likely that a pull will, eventually, import new changesets in your tree. @@ -133,7 +133,7 @@ Move multiple changesets: ``rebase`` ------------------------------------------------------------- +------------------------------------ You can still use rebase to move a whole segment of the changeset graph together. @@ -141,7 +141,7 @@ divergent versions of the changesets. Resolve history troubles: ``evolve`` ------------------------------------------------------------- +------------------------------------ When you rewrite (amend) a changeset with children without rewriting those children you create *unstable* changesets and *suspended @@ -155,7 +155,7 @@ Fix my history afterward: ``prune -n`` ------------------------------------------------------------- +-------------------------------------- Sometimes you need to create an obsolete marker by hand. This may happen when upstream has applied some of your patches for example. @@ -164,7 +164,7 @@ marker. View diff from the last amend ------------------------------------------------------------- +----------------------------- An ``odiff`` alias have been added by ``enable.sh`` @@ -173,7 +173,7 @@ odiff = diff --rev 'limit(precursors(.),1)' --rev . View obsolete markers ------------------------------------------------------------- +--------------------- hgview_ is the only viewer that currently supports this feature. You need version 1.6.2 @@ -193,10 +193,10 @@ Important Note -===================================================================== +============== View change to your file ------------------------------------------------------------- +------------------------ Extinct changesets are hidden using the *hidden* feature of mercurial.
--- a/docs/evolve-good-practice.rst Thu Apr 23 09:03:08 2015 -0400 +++ b/docs/evolve-good-practice.rst Thu Apr 23 21:05:54 2015 -0400 @@ -6,7 +6,7 @@ ----------------------------------------- Avoid unstability --------------------------------- +----------------- The less unstability you have the less you need to resolve. @@ -14,7 +14,7 @@ not ready neither. Branch as much as possible --------------------------------- +-------------------------- This is not MQ; you are not constrained to linear history. @@ -22,7 +22,7 @@ and conflict. Rewrite your changes only ------------------------------------------------- +------------------------- There is no descent conflict detection and handling right now. Rewriting other people's changesets guarantees that you will get @@ -40,7 +40,7 @@ Do not get too confident ---------------------------- +------------------------ This is an experimental extension and a complex concept. This is beautiful, powerful and robust on paper, but the tool and your mind may not be prepared for
--- a/docs/from-mq.rst Thu Apr 23 09:03:08 2015 -0400 +++ b/docs/from-mq.rst Thu Apr 23 21:05:54 2015 -0400 @@ -1,12 +1,12 @@ .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> .. Logilab SA <contact@logilab.fr> -------------------------------------------- +----------------------------------- From MQ To Evolve, The Refugee Book -------------------------------------------- +----------------------------------- Cheat sheet -------------- +----------- ============================== ============================================ mq command new equivalent @@ -28,10 +28,10 @@ Replacement details ---------------------- +------------------- hg qseries -``````````` +`````````` All your work in progress is now in real changesets all the time. @@ -45,7 +45,7 @@ wip = log -r 'not public()' --template='{rev}:{node|short} {desc|firstline}\n' hg qnew -```````` +``````` With evolve you handle standard changesets without an additional overlay. @@ -66,7 +66,7 @@ new-commit=secret hg qref -```````` +``````` A new command from evolution will allow you to rewrite the changeset you are currently on. Just call: @@ -90,7 +90,7 @@ .. note: refresh is an alias for amend hg qref --exclude -````````````````````` +````````````````` To remove changes from your current commit use:: @@ -98,7 +98,7 @@ hg qpop -````````` +``````` The following command emulates the behavior of hg qpop: @@ -136,14 +136,14 @@ hg qrm -``````` +`````` evolution introduce a new command to mark a changeset as "not wanted anymore".:: $ hg prune <revset> hg qfold -````````` +```````` :: @@ -151,14 +151,14 @@ $ hg fold first::last hg qdiff -````````` +```````` ``pdiff`` is an alias for `hg diff -r .^` It works like qdiff, but outside MQ. hg qfinish and hg qimport -```````````````````````````` +````````````````````````` These are not necessary anymore. If you want to control the mutability of changesets, see the phase feature. @@ -166,7 +166,7 @@ hg qcommit -``````````````` +`````````` If you really need to send patches through versioned mq patches, you should look at the qsync extension.
--- a/docs/obs-terms.rst Thu Apr 23 09:03:08 2015 -0400 +++ b/docs/obs-terms.rst Thu Apr 23 21:05:54 2015 -0400 @@ -1,12 +1,12 @@ .. Copyright 2011 Pierre-Yves David <pierre-yves.david@ens-lyon.org> .. Logilab SA <contact@logilab.fr> ------------------------------------------------------------ +----------------------------------- Terminology of the obsolete concept ------------------------------------------------------------ +----------------------------------- Obsolete markers ---------------------------------- +---------------- The mutable concept is based on **obsolete markers**. Creating an obsolete marker registers a relation between an old obsoleted changeset and its newer @@ -54,7 +54,7 @@ better distinction between *direct successors* and **any successors**. Possible changesets "type" ---------------------------------- +-------------------------- The following table describes names and behaviors of changesets affected by obsolete markers. The left column describes generic categories and the right @@ -182,7 +182,7 @@ Command and operation name ---------------------------------- +-------------------------- Existing terms @@ -196,7 +196,7 @@ Uncommit -````````````` +```````` Remove files from a commit (and leave them as dirty in the working directory) @@ -204,14 +204,14 @@ `rollback` usage. Fold -`````````` +```` Collapse multiple changesets into a unique one. The *evolve* extension will have a `fold` command. Prune -`````````` +````` Make a changeset obsolete without successors. @@ -223,7 +223,7 @@ - obsolete: too vague, too long and too generic. evolve -``````````````` +`````` Automatically resolve *troublesome* changesets (*unstable*, *bumped* and *divergent*)