upstream/mercurial-mirror Files · hgext3rd/__init__.py

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

Pierre-Yves David - - Load All Authors

File last commit:

r28541:4b81487a default


                r39017:d49e490a

@94 stable

Download file

             __init__.py
        
                    4 lines
            
             | 157 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext3rd / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # name space package to host third party extensions

      from __future__ import absolute_import

      import pkgutil

      __path__ = pkgutil.extend_path(__path__, __name__)

	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

				# name space package to host third party extensions
				from __future__ import absolute_import
				import pkgutil
				__path__ = pkgutil.extend_path(__path__, __name__)