##// END OF EJS Templates
merge: don't try to merge subrepos twice (issue4988)...
merge: don't try to merge subrepos twice (issue4988) In my patch series ending with rev 25e4b2f000c5 I switched most change/delete conflicts to be handled at the resolve layer. .hgsubstate was the one file that we weren't able to handle, so we kept the old code path around for it. The old code path added .hgsubstate to one of the other lists as the user specifies, including possibly the 'g' list. Now since we did this check after converting the actions from being keyed by file to being keyed by action type, there was nothing that actually removed .hgsubstate from the 'cd' or 'dc' lists. This meant that the file would eventually make its way into the 'mergeactions' list, now freshly augmented with 'cd' and 'dc' actions. We call subrepo.submerge for both 'g' actions and merge actions. This means that if the resolution to an .hgsubstate change/delete conflict was to add it to the 'g' list, subrepo.submerge would be called twice. It turns out that this doesn't cause any adverse effects on Linux due to caching, but apparently breaks on other operating systems including Windows. The fix here moves this to before we convert the actions over. This ensures that it .hgsubstate doesn't make its way into multiple lists. The real fix here is going to be: (1) move .hgsubstate conflict resolution into the resolve layer, and (2) use a real data structure for the actions rather than shuffling data around between lists and dictionaries: we need a hash (or prefix-based) index by file and a list index by action type. There's a very tiny behavior change here: collision detection on case-insensitive systems will happen after this is resolved, not before. I think this is the right change -- .hgsubstate could theoretically collide with other files -- but in any case it makes no practical difference. Thanks to Yuya Nishihara for investigating this.

File last commit:

r25284:7072b91c default
r27951:6bce6d92 stable
Show More
hgignore.txt
94 lines | 3.0 KiB | text/plain | TextLexer
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044 Synopsis
FUJIWARA Katsunori
doc: unify section level between help topics...
r17267 ========
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044
The Mercurial system uses a file called ``.hgignore`` in the root
directory of a repository to control its behavior when it searches
for files that it is not currently tracking.
Description
FUJIWARA Katsunori
doc: unify section level between help topics...
r17267 ===========
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044
The working directory of a Mercurial repository will often contain
files that should not be tracked by Mercurial. These include backup
files created by editors and build products created by compilers.
These files can be ignored by listing them in a ``.hgignore`` file in
the root of the working directory. The ``.hgignore`` file must be
created manually. It is typically put under version control, so that
the settings will propagate to other repositories with push and pull.
An untracked file is ignored if its path relative to the repository
root directory, or any prefix path of that path, is matched against
any pattern in ``.hgignore``.
For example, say we have an untracked file, ``file.c``, at
``a/b/file.c`` inside our repository. Mercurial will ignore ``file.c``
if any pattern in ``.hgignore`` matches ``a/b/file.c``, ``a/b`` or ``a``.
In addition, a Mercurial configuration file can reference a set of
Wagner Bruna
help/hgignore: refer to the builtin help instead of external URLs
r14668 per-user or global ignore files. See the ``ignore`` configuration
key on the ``[ui]`` section of :hg:`help config` for details of how to
configure these files.
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044
Wagner Bruna
help/hgignore: refer to the builtin help instead of external URLs
r14668 To control Mercurial's handling of files that it manages, many
commands support the ``-I`` and ``-X`` options; see
:hg:`help <command>` and :hg:`help patterns` for details.
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044
Adrian Buehlmann
help: explain effect of .hgignore on tracked files
r17116 Files that are already tracked are not affected by .hgignore, even
if they appear in .hgignore. An untracked file X can be explicitly
added with :hg:`add X`, even if X would be excluded by a pattern
in .hgignore.
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044 Syntax
FUJIWARA Katsunori
doc: unify section level between help topics...
r17267 ======
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044
An ignore file is a plain text file consisting of a list of patterns,
with one pattern per line. Empty lines are skipped. The ``#``
character is treated as a comment character, and the ``\`` character
is treated as an escape character.
Mercurial supports several pattern syntaxes. The default syntax used
is Python/Perl-style regular expressions.
To change the syntax used, use a line of the following form::
syntax: NAME
where ``NAME`` is one of the following:
``regexp``
Regular expression, Python/Perl syntax.
``glob``
Shell-style glob.
The chosen syntax stays in effect when parsing all patterns that
follow, until another syntax is selected.
Neither glob nor regexp patterns are rooted. A glob-syntax pattern of
the form ``*.c`` will match a file ending in ``.c`` in any directory,
and a regexp pattern of the form ``\.c$`` will do the same. To root a
regexp pattern, start it with ``^``.
Durham Goode
help: add documentation on include: and subinclude:...
r25284 Subdirectories can have their own .hgignore settings by adding
``subinclude:path/to/subdir/.hgignore`` to the root ``.hgignore``. See
:hg:`help patterns` for details on ``subinclude:`` and ``include:``.
FUJIWARA Katsunori
doc: add note about pattern rooted/unrooted cases to "hgignore" and "patterns"...
r16504 .. note::
Simon Heimberg
help: remove last occurrences of ".. note::" without two newlines...
r20532
FUJIWARA Katsunori
doc: add note about pattern rooted/unrooted cases to "hgignore" and "patterns"...
r16504 Patterns specified in other than ``.hgignore`` are always rooted.
Please see :hg:`help patterns` for details.
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044 Example
FUJIWARA Katsunori
doc: unify section level between help topics...
r17267 =======
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044
Here is an example ignore file. ::
# use glob syntax.
syntax: glob
*.elc
*.pyc
*~
# switch to regexp syntax.
syntax: regexp
^\.pc/