diff -r c56109c9aebf -r dd5765ae91c3 docs/evolve-faq.rst --- a/docs/evolve-faq.rst Thu Jan 24 18:02:00 2013 -0500 +++ b/docs/evolve-faq.rst Thu Jan 24 18:05:59 2013 -0500 @@ -23,19 +23,19 @@ To understand what the result of amend will be I use the two following aliases [#]_:: - # diff what amend will look likes + # diff what amend will look like pdiff=diff --rev .^ - # status what amend will look likes + # status what amend will look like pstatus=status --rev .^ -It takes various options to pick an author, a date and the branch of the -result... (see ``hg help amend`` for details). +It takes various options to pick an author, a date, and the branch of the +result (see ``hg help amend`` for details). -This command can even be invoked on changesets with children (provided -none is public) ! +This command can even be invoked on changesets with children, provided +none are public. -.. note:: the amend command is very similar to mq's ``qrefresh``, a ``refresh`` +.. note:: As the amend command is very similar to mq's ``qrefresh``, a ``refresh`` alias for amend is also available. But note that contrary to ``qrefresh``, ``amend`` does not exclude changes on file not specified on the command line. @@ -50,7 +50,7 @@ Move a changeset: ``graft`` ------------------------------------------------------------ -The graft command introduced in 2.0 allows to "copy changes from other +The graft command introduced in 2.0 allows you to "copy changes from other branches onto the current branch". The graft command has been altered to allow the creation of an @@ -81,19 +81,18 @@ ------------------------------------------------------------ While working on mutable part of the history you often need to move between -mutable commit. +mutable commits. You just need to use standard update to work with evolve. For convenience, you -can use ``hg gup`` to move to children commit or ``hg gdown`` to move to working -directory parent commit. +can use ``hg gup`` to move to the child commit or ``hg gdown`` to move to the parent commit. -.. note:: those command only exist for the convenience of getting qpush and qpop +.. note:: Those commands only exist for the convenience of getting qpush and qpop feeling back. Collapse changesets: ``fold`` ------------------------------------------------------------ -you can use ``hg fold`` to collapse multiple changesets in a single one. +You can use ``hg fold`` to collapse multiple changesets in a single one. Getting changes out of a commit ------------------------------------------------------------ @@ -116,7 +115,7 @@ To split on file boundaries, just use ``uncommit`` command. -If you need fine-grained split, there is no official command for that yet. +If you need a fine-grained split, there is no official command for that yet. However, it is easily achieved by manual operation:: ### you want to split changeset A: 42 @@ -132,7 +131,7 @@ # current changeset (.) and previous one (.^) replace A (42) $ hg prune --new . --new .^ 42 -For more complexe scenario we recommand the use of the histedit_ extension. +For more complexe scenario we recommend the use of the histedit_ extension. .. _histedit:: http://mercurial.selenic.com/wiki/HisteditExtension @@ -143,7 +142,7 @@ Whenever you are working on some changesets, it is more likely that a pull will, eventually, import new changesets in your tree. -And it is likely that you will want your work in progress changiesets to be +And it is likely that you will want your work in progress changesets to be rebased on the top of this newly imported subtree. Doing so is only a matter of rebasing.