# HG changeset patch # User Anton Shestakov # Date 1563529245 -28800 # Node ID 3968f6d58591562543f0b008b7f8aa1b3f8b65d2 # Parent 184c64c815288d910d58461a214e594cffb35871 docs: update evolve-faq.rst with new prune flag and proper vocabulary Also strip trailing newlines. diff -r 184c64c81528 -r 3968f6d58591 docs/evolve-faq.rst --- a/docs/evolve-faq.rst Fri Jul 19 17:25:29 2019 +0800 +++ b/docs/evolve-faq.rst Fri Jul 19 17:40:45 2019 +0800 @@ -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 --succ `` to add obsolete -marker. +You can use ``hg prune --successor `` 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 - - - - - - - - -