docs/evolve-faq.rst
changeset 4774 12a88b988875
parent 4764 3968f6d58591
equal deleted inserted replaced
4762:75bc0a51809a 4774:12a88b988875
   155 
   155 
   156 
   156 
   157 Fix my history afterward: ``prune -n``
   157 Fix my history afterward: ``prune -n``
   158 --------------------------------------
   158 --------------------------------------
   159 
   159 
   160 Sometimes you need to create an obsolete marker by hand. This may happen when
   160 Sometimes you need to create an obsolescence marker by hand. This may happen
   161 upstream has applied some of your patches for example.
   161 when upstream has applied some of your patches for example.
   162 
   162 
   163 you can use ``hg prune <old-changeset> --succ <new-changeset>`` to add obsolete
   163 You can use ``hg prune <old-changeset> --successor <new-changeset>`` to add
   164 marker.
   164 obsolescence marker.
   165 
   165 
   166 View diff from the last amend
   166 View diff from the last amend
   167 -----------------------------
   167 -----------------------------
   168 
   168 
   169 An ``odiff`` alias have been added by ``enable.sh``
   169 An ``odiff`` alias have been added by ``enable.sh``
   170 
   170 
   171 ::
   171 ::
   172     [alias]
   172     [alias]
   173     odiff = diff --rev 'limit(predecessors(.),1)' --rev .
   173     odiff = diff --rev 'limit(predecessors(.),1)' --rev .
   174 
   174 
   175 View obsolete markers
   175 View obsolescence markers
   176 ---------------------
   176 -------------------------
   177 
   177 
   178 hgview_ is the only viewer that currently supports this feature. You
   178 hgview_ is the only viewer that currently supports this feature. You
   179 need version 1.6.2
   179 need version 1.6.2
   180 
   180 
   181 .. _hgview: http://www.logilab.org/project/hgview/
   181 .. _hgview: http://www.logilab.org/project/hgview/
   202 
   202 
   203 Only ``hg log`` and ``hgview`` support it, other
   203 Only ``hg log`` and ``hgview`` support it, other
   204 graphical viewer do not.
   204 graphical viewer do not.
   205 
   205 
   206 You can use ``hg log --graph --hidden`` from the command line
   206 You can use ``hg log --graph --hidden`` from the command line
   207 
       
   208 
       
   209 
       
   210 
       
   211 
       
   212 
       
   213 
       
   214 
       
   215