##// END OF EJS Templates
merge: sort filemap only if requested by the caller...
merge: sort filemap only if requested by the caller The name `sorted` refers to a built-in function, which is always true, so the else branch of this if statement was dead code. Because, with this fix, the function can iterate over the dict items while yielding values, the dict should not change size while the generator is running. Because of that, it is required to re-introduce code that makes a caller copy the filemap before modification, which was removed in 3c783ff08d40cbaf36eb27ffe1d296718c0f1d77 (that changeset also introduced the filemap() method including the bug that’s being fixed by this changeset).

File last commit:

r52561:45ba8416 stable
r52711:23116aef stable
Show More
hgignore.5.txt
34 lines | 723 B | text/plain | TextLexer
Matt Harbison
help: create packages for the help text...
r44031 ==========
hgignore
==========
---------------------------------
syntax for Mercurial ignore files
---------------------------------
:Author: Vadim Gelfer <vadim.gelfer@gmail.com>
:Organization: Mercurial
:Manual section: 5
:Manual group: Mercurial Manual
.. include:: hgignore.5.gendoc.txt
Author
======
Vadim Gelfer <vadim.gelfer@gmail.com>
Raphaël Gomès
contributor: change mentions of mpm to olivia...
r47575 Mercurial was written by Olivia Mackall <olivia@selenic.com>.
Matt Harbison
help: create packages for the help text...
r44031
See Also
========
|hg(1)|_, |hgrc(5)|_
Copying
=======
This manual page is copyright 2006 Vadim Gelfer.
av6
copyright: update to 2024
r52561 Mercurial is copyright 2005-2024 Olivia Mackall.
Matt Harbison
help: create packages for the help text...
r44031 Free use of this software is granted under the terms of the GNU General
Public License version 2 or any later version.
.. include:: common.txt