Mercurial > evolve
diff docs/evolve-faq.rst @ 4770:97f1a229dd99 mercurial-4.8
test-compat: merge mercurial-4.9 into mercurial-4.8
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 29 Jul 2019 11:40:18 +0200 |
| parents | 3968f6d58591 |
| children |
line wrap: on
line diff
--- a/docs/evolve-faq.rst Wed Jun 05 17:39:32 2019 +0200 +++ b/docs/evolve-faq.rst Mon Jul 29 11:40:18 2019 +0200 @@ -157,11 +157,11 @@ 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. +Sometimes you need to create an obsolescence marker by hand. This may happen +when upstream has applied some of your patches for example. -you can use ``hg prune <old-changeset> --succ <new-changeset>`` to add obsolete -marker. +You can use ``hg prune <old-changeset> --successor <new-changeset>`` to add +obsolescence marker. View diff from the last amend ----------------------------- @@ -172,8 +172,8 @@ [alias] odiff = diff --rev 'limit(predecessors(.),1)' --rev . -View obsolete markers ---------------------- +View obsolescence markers +------------------------- hgview_ is the only viewer that currently supports this feature. You need version 1.6.2 @@ -204,12 +204,3 @@ graphical viewer do not. You can use ``hg log --graph --hidden`` from the command line - - - - - - - - -