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

dirstate: use a new `drop_merge_data` in `setparent`...

dirstate: use a new `drop_merge_data` in `setparent` What is happening in this `setparent` loop is that we remove all `merge` related information when the dirstate is moved out of a `merge` situation. So instead of shuffling state to get them where we want, we simply add a method on the DirstateItem to do drop the information we want dropped. Differential Revision: https://phab.mercurial-scm.org/D11506

Steven Stallion - - Load All Authors

File last commit:

r16438:28a90cdf default


                r48874:a660d8a5

default

Download file

             __init__.py
        
                    0 lines
            
             | 0 B
            
                | text/x-python
            
             |
                PythonLexer

/ mercurial / pure / __init__.py

History | Annotation | Raw |Copy content |Copy permalink

	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