upstream/mercurial-mirror Files · .editorconfig

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

Gregory Szorc - - Load All Authors

File last commit:

r38300:1d606633 default


                r39017:d49e490a

@94 stable

Download file

             .editorconfig
        
                    18 lines
            
             | 297 B
            
                | text/x-ini
            
             |
                IniLexer
            
             / .editorconfig
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # See http://EditorConfig.org for the specification

      root = true

      [*.py]

      indent_size = 4

      indent_style = space

      trim_trailing_whitespace = true

      [*.{c,h}]

      indent_size = 8

      indent_style = tab

      trim_trailing_whitespace = true

      [*.t]

      indent_size = 2

      indent_style = space

      trim_trailing_whitespace = false

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages

				# See http://EditorConfig.org for the specification

				root = true

				[*.py]
				indent_size = 4
				indent_style = space
				trim_trailing_whitespace = true

				[*.{c,h}]
				indent_size = 8
				indent_style = tab
				trim_trailing_whitespace = true

				[*.t]
				indent_size = 2
				indent_style = space
				trim_trailing_whitespace = false