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/hgrc.5.txt
author Durham Goode <durham@fb.com>
Wed, 06 Mar 2013 20:13:09 -0800
changeset 18760 e74704c33e24
parent 17267 979b107eaea2
child 19316 6f3428c528b4
permissions -rw-r--r--
strip: make --keep option not set all dirstate times to 0 hg strip -k was using dirstate.rebuild() which reset all the dirstate entries timestamps to 0. This meant that the next time hg status was run every file was considered to be 'unsure', which caused it to do expensive read operations on every filelog. On a repo with >150,000 files it took 70 seconds when everything was in memory. From a cold cache it took several minutes. The fix is to only reset files that have changed between the working context and the destination context. For reference, --keep means the working directory is left alone during the strip. We have users wanting to use this operation to store their work-in-progress as a commit on a branch while they go work on another branch, then come back later and be able to uncommit that work and continue working. They currently use 'git reset HARD^' to accomplish this in git.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9158
d6eecafaf12f doc: use reStructuredText for man and HTML pages
Martin Geisler <mg@lazybytes.net>
parents: 8900
diff changeset 
     1
 
======
d6eecafaf12f doc: use reStructuredText for man and HTML pages
Martin Geisler <mg@lazybytes.net>
parents: 8900
diff changeset 
     2
 
 hgrc
d6eecafaf12f doc: use reStructuredText for man and HTML pages
Martin Geisler <mg@lazybytes.net>
parents: 8900
diff changeset 
     3
 
======
671
efa4a7e2f322 Move hgrc documentation out to its own man page, hgrc(5).
Bryan O'Sullivan <bos@serpentine.com>
parents:
diff changeset 
     4
 







9158






d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




     5


---------------------------------













d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




     6


configuration files for Mercurial













d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




     7


---------------------------------













d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




     8














d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




     9


:Author:         Bryan O'Sullivan <bos@serpentine.com>













d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




    10


:Organization:   Mercurial













d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




    11


:Manual section: 5













d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




    12


:Manual group:   Mercurial Manual













d6eecafaf12f
doc: use reStructuredText for man and HTML pages



Martin Geisler <mg@lazybytes.net>


parents: 
8900

diff
changeset




    13









9422






ec26d6986d85
doc: add TOC to hg.1.html and hgrc.5.html



Martin Geisler <mg@lazybytes.net>


parents: 
9381

diff
changeset




    14


.. contents::













ec26d6986d85
doc: add TOC to hg.1.html and hgrc.5.html



Martin Geisler <mg@lazybytes.net>


parents: 
9381

diff
changeset




    15


   :backlinks: top













ec26d6986d85
doc: add TOC to hg.1.html and hgrc.5.html



Martin Geisler <mg@lazybytes.net>


parents: 
9381

diff
changeset




    16


   :class: htmlonly













ec26d6986d85
doc: add TOC to hg.1.html and hgrc.5.html



Martin Geisler <mg@lazybytes.net>


parents: 
9381

diff
changeset




    17









671






efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    18









9792






dd1a95ccbe07
doc: use titlecase in man page section titles



Martin Geisler <mg@lazybytes.net>


parents: 
9784

diff
changeset




    19


Synopsis








17267






979b107eaea2
doc: unify section level between help topics



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
16548

diff
changeset




    20


========








671






efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    21









14456






ff4126ce9301
help: move part of hgrc.5 man page config help topic



Yun Lee <yun.lee.bj@gmail.com>


parents: 
14455

diff
changeset




    22


.. include:: ../mercurial/help/config.txt








938






54b2a42e501e
hgweb: add [web] section to hgrc



mpm@selenic.com


parents: 
705

diff
changeset




    23









9792






dd1a95ccbe07
doc: use titlecase in man page section titles



Martin Geisler <mg@lazybytes.net>


parents: 
9784

diff
changeset




    24


Author








17267






979b107eaea2
doc: unify section level between help topics



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
16548

diff
changeset




    25


======








671






efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    26


Bryan O'Sullivan <bos@serpentine.com>.













efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    27














efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    28


Mercurial was written by Matt Mackall <mpm@selenic.com>.













efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    29









9792






dd1a95ccbe07
doc: use titlecase in man page section titles



Martin Geisler <mg@lazybytes.net>


parents: 
9784

diff
changeset




    30


See Also








17267






979b107eaea2
doc: unify section level between help topics



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
16548

diff
changeset




    31


========








9162






2399362b3bb0
doc: link man pages to one another



Martin Geisler <mg@lazybytes.net>


parents: 
9161

diff
changeset




    32


|hg(1)|_, |hgignore(5)|_








671






efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    33









9792






dd1a95ccbe07
doc: use titlecase in man page section titles



Martin Geisler <mg@lazybytes.net>


parents: 
9784

diff
changeset




    34


Copying








17267






979b107eaea2
doc: unify section level between help topics



FUJIWARA Katsunori <foozy@lares.dti.ne.jp>


parents: 
16548

diff
changeset




    35


=======








671






efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    36


This manual page is copyright 2005 Bryan O'Sullivan.








16548






e49e039acd5e
doc: update copyright years to 2012



Martin Geisler <mg@aragost.com>


parents: 
14460

diff
changeset




    37


Mercurial is copyright 2005-2012 Matt Mackall.








671






efa4a7e2f322
Move hgrc documentation out to its own man page, hgrc(5).



Bryan O'Sullivan <bos@serpentine.com>


parents: 

diff
changeset




    38


Free use of this software is granted under the terms of the GNU General








10263






25e572394f5c
Update license to GPLv2+



Matt Mackall <mpm@selenic.com>


parents: 
10211

diff
changeset




    39


Public License version 2 or any later version.








9162






2399362b3bb0
doc: link man pages to one another



Martin Geisler <mg@lazybytes.net>


parents: 
9161

diff
changeset




    40














2399362b3bb0
doc: link man pages to one another



Martin Geisler <mg@lazybytes.net>


parents: 
9161

diff
changeset




    41


.. include:: common.txt















hg-stable