Mercurial > evolve
changeset 642:f8c75459e8bd stable
doc: updates mq refugee book
| author | Pierre-Yves David <pierre-yves.david@logilab.fr> |
|---|---|
| date | Wed, 02 Jan 2013 14:22:20 +0100 |
| parents | 40292a37388f |
| children | cb6422fae653 |
| files | docs/from-mq.rst |
| diffstat | 1 files changed, 7 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/docs/from-mq.rst Wed Jan 02 14:17:17 2013 +0100 +++ b/docs/from-mq.rst Wed Jan 02 14:22:20 2013 +0100 @@ -14,12 +14,13 @@ qseries ``log`` qnew ``commit`` qrefresh ``amend`` +qrefresh --exclude ``uncommit`` qpop ``update`` or ``gdown`` qpush ``update`` or ``gup`` sometimes ``evolve`` qrm ``prune`` qfold ``fold`` qdiff ``odiff`` -qrecord ``/qrecord`` +qrecord ``record`` qfinish -- qimport -- @@ -86,10 +87,10 @@ .. $ hg record babar.py .. $ hg amend -c .^ # .^ refer to "working directoy parent, here 'feature A' -note: refresh is an alias for amend +.. note: refresh is an alias for amend -hg qref -X -```````````` +hg qref --exclude +````````````````````` To remove changes from you current commit use:: @@ -114,10 +115,10 @@ ```````` When you rewrite changesets, descendants of rewritten changesets are marked as -"out of sync". You need to rewrite them on top of the new version of their +"unstable". You need to rewrite them on top of the new version of their ancestor. -The evolution extension adds a command to rewrite the "out of sync" +The evolution extension adds a command to rewrite "unstable" changesets::: $ hg evolve @@ -141,13 +142,6 @@ $ hg prune <revset> -hg qrm -``````` - -:: - - $ hg fold <first>::<last> - hg qfold `````````