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

shelve: make --keep option survive user intervention (issue5431)...

shelve: make --keep option survive user intervention (issue5431) Currently if user runs 'hg unshelve --keep' and merge conflicts occur, the information about --keep provided by user is lost and shelf is deleted after 'hg unshelve --continue'. This is obviously not desired, so this patch fixes it.

Pierre-Yves David - - Load All Authors

File last commit:

r28450:155e3308 default


                r30522:7b3136bc

default

Download file

             __init__.py
        
                    3 lines
            
             | 105 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      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

				from __future__ import absolute_import
				import pkgutil
				__path__ = pkgutil.extend_path(__path__, __name__)