upstream/mercurial-mirror Files · tests/test-simplemerge.py.out

shelve: directly handle the initial parent alignment...

shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

Pierre-Yves David - - Load All Authors

File last commit:

r22023:f1883065 default


                r38637:c829749e

default

Download file

             test-simplemerge.py.out
        
                    5 lines
            
             | 115 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-simplemerge.py.out

History | Source | Raw |Copy content |Copy permalink

Pierre-Yves David simplemerge: burn "minimal" feature to the ground...	r22023	................
Alexis S. L. Carvalho actually port simplemerge to hg...	r4363	----------------------------------------------------------------------
Pierre-Yves David simplemerge: burn "minimal" feature to the ground...	r22023	Ran 16 tests in 0.000s
Alexis S. L. Carvalho actually port simplemerge to hg...	r4363
		OK

	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