upstream/mercurial-mirror Files · tests/test-resolve.out

localrepo: introduce method for explicit branch cache update...

localrepo: introduce method for explicit branch cache update Currently, localrepo.branchtags() is called in two locations to update the _branchcache dict, however branchtags() itself does not update anything, it calls branchmap() to do so. This change introduces a new updatebranchcache() method that is used by both branchmap() and the calls to update the cache.

Martin Geisler - - Load All Authors

File last commit:

r11451:51021f4c stable


                r12066:d01e2865

default

Download file

             test-resolve.out
        
                    9 lines
            
             | 344 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-resolve.out

History | Source | Raw |Copy content |Copy permalink

Martin Geisler reset mergestate after commit	r7734	adding file
		% create a second head
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		created new head
		% failing merge
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Stuart W Marks hg: say 'hg update' instead of 'hg up' in merge status message...	r9468	use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
Martin Geisler reset mergestate after commit	r7734	% resolve -l, should be empty
Martin Geisler resolve: do not crash on empty mergestate...	r11451	% resolve -l, should be empty

	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