Mercurial Mercurial > hg-stable / annotate
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
doc/README
author Kyle Lippincott <spectral@google.com>
Wed, 18 Dec 2019 14:07:58 -0800
changeset 43967 eebdd6709868
parent 9419 3516a4e877c1
permissions -rw-r--r--
fix: fix handling of merge commits by using overlayworkingctx Most of this code was conceptually copied from what rebase does, with one small difference: hgext.rebaserev.rebase uses branchmerge=True, while I had to use branchmerge=False, or else it got really confused about updating to the same revision in some situations. I believe that the difference is that rebase is always dealing with *some* form of update - it never gets to mergemod.update if the source and destination are the same, while we can encounter that situation with fix. This may imply that this code has some issues with named branches that should be investigated. Differential Revision: https://phab.mercurial-scm.org/D7703
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9172
bc1de09090bc doc: update README with links to Docutils
Martin Geisler <mg@lazybytes.net>
parents: 5048
diff changeset 
     1
 
Mercurial's documentation is kept in reStructuredText format, which is
bc1de09090bc doc: update README with links to Docutils
Martin Geisler <mg@lazybytes.net>
parents: 5048
diff changeset 
     2
 
a simple plain text format that's easy to read and edit:
177
91055f795d88 adding doc directory and files
jake@edge2.net
parents:
diff changeset 
     3
 







9172






bc1de09090bc
doc: update README with links to Docutils



Martin Geisler <mg@lazybytes.net>


parents: 
5048

diff
changeset




     4


  http://docutils.sourceforge.net/rst.html








177






91055f795d88
adding doc directory and files



jake@edge2.net


parents: 

diff
changeset




     5









9172






bc1de09090bc
doc: update README with links to Docutils



Martin Geisler <mg@lazybytes.net>


parents: 
5048

diff
changeset




     6


It's also convertible to a variety of other formats including standard








9419






3516a4e877c1
doc/README: simplify instructions



Martin Geisler <mg@lazybytes.net>


parents: 
9406

diff
changeset




     7


UNIX man page format and HTML. You'll need to install Docutils:








177






91055f795d88
adding doc directory and files



jake@edge2.net


parents: 

diff
changeset




     8









9172






bc1de09090bc
doc: update README with links to Docutils



Martin Geisler <mg@lazybytes.net>


parents: 
5048

diff
changeset




     9


  http://docutils.sourceforge.net/








177






91055f795d88
adding doc directory and files



jake@edge2.net


parents: 

diff
changeset




    10









9172






bc1de09090bc
doc: update README with links to Docutils



Martin Geisler <mg@lazybytes.net>


parents: 
5048

diff
changeset




    11


Use the Makefile in this directory to generate the man and HTML pages.















hg-stable