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.

     1

==========

     2

 hgignore

     3

==========

     4

     5

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

     6

syntax for Mercurial ignore files

     7

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

     8

     9

:Author:         Vadim Gelfer <vadim.gelfer@gmail.com>

    10

:Organization:   Mercurial

    11

:Manual section: 5

    12

:Manual group:   Mercurial Manual

    13

    14

.. include:: ../mercurial/help/hgignore.txt

    15

    16

Author

    17

======

    18

Vadim Gelfer <vadim.gelfer@gmail.com>

    19

    20

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

    21

    22

See Also

    23

========

    24

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

    25

    26

Copying

    27

=======

    28

This manual page is copyright 2006 Vadim Gelfer.

    29

Mercurial is copyright 2005-2012 Matt Mackall.

    30

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

    31

Public License version 2 or any later version.

    32

    33

.. include:: common.txt

    34