##// END OF EJS Templates
unshelve: disable unshelve during merge (issue5123)...
unshelve: disable unshelve during merge (issue5123) As stated in the issue5123, unshelve can destroy the second parent of the context when tried to unshelve with an uncommitted merge. This patch makes unshelve to abort when called with an uncommitted merge. See how shelve.mergefiles works. Commit structure looks like this: ``` ... -> pctx -> tmpwctx -> shelvectx / / second merge parent pctx = parent before merging working context(first merge parent) tmpwctx = commited working directory after merge(with two parents) shelvectx = shelved context ``` shelve.mergefiles first updates to pctx then it reverts shelvectx to pctx with: ``` cmdutil.revert(ui, repo, shelvectx, repo.dirstate.parents(), *pathtofiles(repo, files), **{'no_backup': True}) ``` Reverting tmpwctx files that were merged from second parent to pctx makes them added because they are not in pctx. Changing this revert operation is crucial to restore parents after unshelve. This is a complicated issue as this is not fixing a regression. Thus, for the time being, unshelve during an uncommitted merge can be aborted. (Details taken from http://mercurial.808500.n3.nabble.com/PATCH-V3-shelve-restore-parents-after-unshelve-issue5123-tt4036858.html#a4037408) Differential Revision: https://phab.mercurial-scm.org/D6169

File last commit:

r41318:4fab8a7d default
r42217:03f6480b default
Show More
hgignore.txt
97 lines | 3.2 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.
Valentin Gatien-Baron
match: support rooted globs in hgignore...
r41318 ``rootglob``
A variant of ``glob`` that is rooted (see below).
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044
The chosen syntax stays in effect when parsing all patterns that
follow, until another syntax is selected.
Valentin Gatien-Baron
match: support rooted globs in hgignore...
r41318 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 ``^``. To get the same
effect with glob-syntax, you have to use ``rootglob``.
Yun Lee
help: move hgignore man page into built-in help (issue2769)
r14044
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/