Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
27656:57c0d4888ca8 | 27657:7b5c8c8a2f8c |
---|---|
985 | 985 |
986 ``always`` | 986 ``always`` |
987 Optional. Always use the proxy, even for localhost and any entries | 987 Optional. Always use the proxy, even for localhost and any entries |
988 in ``http_proxy.no``. (default: False) | 988 in ``http_proxy.no``. (default: False) |
989 | 989 |
990 ``merge`` | |
991 --------- | |
992 | |
993 This section specifies behavior during merges and updates. | |
994 | |
995 ``checkunknown`` | |
996 Controls behavior when an unknown file on disk has the same name as a tracked | |
997 file in the changeset being merged or updated to, and has different | |
998 contents. Options are ``abort``, ``warn`` and ``ignore``. With ``abort``, | |
999 abort on such files. With ``warn``, warn on such files and back them up as | |
1000 .orig. With ``ignore``, don't print a warning and back them up as | |
1001 .orig. (default: ``abort``) | |
1002 | |
990 ``merge-patterns`` | 1003 ``merge-patterns`` |
991 ------------------ | 1004 ------------------ |
992 | 1005 |
993 This section specifies merge tools to associate with particular file | 1006 This section specifies merge tools to associate with particular file |
994 patterns. Tools matched here will take precedence over the default | 1007 patterns. Tools matched here will take precedence over the default |