Mercurial > public > mercurial-scm > hg-stable
diff mercurial/help/config.txt @ 27657:7b5c8c8a2f8c
merge: add options to warn or ignore on colliding unknown files
A 'colliding unknown file' is a file that meets all of the following
conditions:
- is untracked or ignored on disk
- is present in the changeset being merged or updated to
- has different contents
Previously, we would always abort whenever we saw such files. With this config
option we can choose to warn and back the unknown files up instead, or even
forgo the warning entirely and silently back the unknown files up.
Common use cases for this configuration include a large scale transition of
formerly ignored unknown files to tracked files. In some cases the files can be
given new names, but in other cases, external "convention over configuration"
constraints have determined that the file must retain the same name as before.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Sat, 02 Jan 2016 03:11:52 -0800 |
| parents | 37d7cf569cf3 |
| children | 72a25271e294 |
line wrap: on
line diff
--- a/mercurial/help/config.txt Sat Jan 02 03:21:01 2016 -0800 +++ b/mercurial/help/config.txt Sat Jan 02 03:11:52 2016 -0800 @@ -987,6 +987,19 @@ Optional. Always use the proxy, even for localhost and any entries in ``http_proxy.no``. (default: False) +``merge`` +--------- + +This section specifies behavior during merges and updates. + +``checkunknown`` + Controls behavior when an unknown file on disk has the same name as a tracked + file in the changeset being merged or updated to, and has different + contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, + abort on such files. With ``warn``, warn on such files and back them up as + .orig. With ``ignore``, don't print a warning and back them up as + .orig. (default: ``abort``) + ``merge-patterns`` ------------------