Mercurial > hg
annotate .editorconfig @ 45467:bb9888d32601
merge: add `ACTION_KEEP_ABSENT` to represent files we want to keep absent
There are files which were deleted/not present in working copy parent but were
present on other side of merge. On merge, we might decide to keep them deleted.
We want to track such cases more closely, rather all kind of cases which results
from some kind of merging logic.
We do have `ACTION_KEEP` but having a dedicated action for the absent case is
more cleaner.
Initially I named the action as `ACTION_KEEP_DELETED` but later realized that
file can be not-present because of other reasons than deletion like rename,
hence decided to use more generic name `ACTION_KEEP_ABSENT`.
Differential Revision: https://phab.mercurial-scm.org/D8974
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Tue, 01 Sep 2020 17:08:26 +0530 |
parents | c25efc468a49 |
children |
rev | line source |
---|---|
28793 | 1 # See http://EditorConfig.org for the specification |
2 | |
3 root = true | |
4 | |
5 [*.py] | |
6 indent_size = 4 | |
7 indent_style = space | |
8 trim_trailing_whitespace = true | |
45392
c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig
Matt Harbison <matt_harbison@yahoo.com>
parents:
38281
diff
changeset
|
9 end_of_line = lf |
28793 | 10 |
11 [*.{c,h}] | |
12 indent_size = 8 | |
13 indent_style = tab | |
14 trim_trailing_whitespace = true | |
45392
c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig
Matt Harbison <matt_harbison@yahoo.com>
parents:
38281
diff
changeset
|
15 end_of_line = lf |
38281
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
16 |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
17 [*.t] |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
18 indent_size = 2 |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
19 indent_style = space |
1d6066336d7b
mercurial: add .t files to .editorconfig
Gregory Szorc <gregory.szorc@gmail.com>
parents:
28793
diff
changeset
|
20 trim_trailing_whitespace = false |
45392
c25efc468a49
mercurial: force LF endings for *.py, *.{c,h} and *.t in .editorconfig
Matt Harbison <matt_harbison@yahoo.com>
parents:
38281
diff
changeset
|
21 end_of_line = lf |