mercurial/help/common.txt
author Mads Kiilerich <madski@unity3d.com>
Fri, 09 Jan 2015 18:38:02 +0100
changeset 23841 9d25bb84cf6c
parent 19426 e43184680461
permissions -rw-r--r--
largefiles: make linear update set unsure largefiles normal if unchanged 'hg update' would hash all 'unsure' largefiles before performing the merge. It would update the standins but not detect the very common case where the largefile never had been changed by the user but just had been marked with an invalid dirstate mtime to make sure any changes done by the user in the same second would be detected. The largefile would remain in that state and would have to be hashed again next time even though it still not had been changed. Sad trombone. Instead, for largefiles listed as 'unsure' or 'modified', after updating the standin with the actual hash, mark the largefile as normal if it turns out to not be modified relative to the revision in the parent revision. That will prevent it from being hashed again next time.
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
9162
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     1
.. Common link and substitution definitions.
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     2
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     3
.. |hg(1)| replace:: **hg**\ (1)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     4
.. _hg(1): hg.1.html
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     5
.. |hgrc(5)| replace:: **hgrc**\ (5)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     6
.. _hgrc(5): hgrc.5.html
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     7
.. |hgignore(5)| replace:: **hgignore**\ (5)
2399362b3bb0 doc: link man pages to one another
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
     8
.. _hgignore(5): hgignore.5.html