Mercurial > hg > mercurial-crew-with-dirclash
annotate doc/README @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
| author | Maxim Dounin <mdounin@mdounin.ru> |
|---|---|
| date | Sat, 27 Oct 2007 16:27:55 +0400 |
| parents | 8db8e1100f3f |
| children |
| rev | line source |
|---|---|
| 453 | 1 Mercurial's documentation is currently kept in ASCIIDOC format, which |
| 2 is a simple plain text format that's easy to read and edit. It's also | |
| 3 convertible to a variety of other formats including standard UNIX man | |
| 4 page format and HTML. | |
| 177 | 5 |
| 453 | 6 To do this, you'll need to install ASCIIDOC: |
| 177 | 7 |
| 453 | 8 http://www.methods.co.nz/asciidoc/ |
| 177 | 9 |
| 453 | 10 To generate the man page: |
| 177 | 11 |
| 453 | 12 asciidoc -d manpage -b docbook hg.1.txt |
| 13 xmlto man hg.1.xml | |
| 177 | 14 |
| 453 | 15 To display: |
| 177 | 16 |
| 453 | 17 groff -mandoc -Tascii hg.1 | more |
| 177 | 18 |
| 453 | 19 To create the html page (without stylesheets): |
| 177 | 20 |
|
5048
8db8e1100f3f
Update asciidoc instructions to suggest html4 for newer versions
Brendan Cully <brendan@kublai.com>
parents:
453
diff
changeset
|
21 asciidoc -b html4 hg.1.txt |
|
8db8e1100f3f
Update asciidoc instructions to suggest html4 for newer versions
Brendan Cully <brendan@kublai.com>
parents:
453
diff
changeset
|
22 |
|
8db8e1100f3f
Update asciidoc instructions to suggest html4 for newer versions
Brendan Cully <brendan@kublai.com>
parents:
453
diff
changeset
|
23 (older asciidoc may want html instead of html4 above) |