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

merge: check filename case collision between changesets for branch merging...

merge: check filename case collision between changesets for branch merging this patch makes branch merging abort when merged changesets have same file in different case on case insensitive filesystem. this patch does not prevent linear update which merges between target and working contexts, because 'branchmerge' is False in such case.

Matt Mackall - - Load All Authors

File last commit:

r1360:7d439981 default


                r15673:d550168f

stable

Download file

             __init__.py
        
                    1 line
            
             | 14 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / hgext / __init__.py
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
Re-add hgext/__init__.py

              r1360
            
      # placeholder

	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