##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

merge: do the trivial resolution after updating sparse checkout...
merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984
Augie Fackler - - Load All Authors

File last commit:

r36242:d0a3fa84 default
r38780:d49e490a @94 stable
Show More
.clang-format
13 lines | 343 B | text/plain | TextLexer
/ .clang-format
History | Source | Raw |Copy content |Copy permalink
Augie Fackler
clang-format: configuration for the clang-format source formatter...
 r34799 BasedOnStyle: LLVM
IndentWidth: 8
UseTab: ForIndentation
BreakBeforeBraces: Linux
AllowShortIfStatementsOnASingleLine: false
IndentCaseLabels: false
AllowShortBlocksOnASingleLine: false
AllowShortFunctionsOnASingleLine: false
Augie Fackler
formatting: enforce system headers before local headers...
 r36242 IncludeCategories:
- Regex: '^<'
Priority: 1
- Regex: '^"'
Priority: 2