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

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict...

rebase: teach in-memory rebase to not restart with on-disk rebase on conflict When in-memory rebase runs into conflicts, it redoes the whole rebase operation. This patch teaches it to instead discard just the current `overlayworkingctx` and redo that node on disk. I've tested this by enabling in-memory rebase by default and checking that there are no unexpected differences after this patch. The next step is to make it so that `hg rebase --continue` can use in-memory merge. Differential Revision: https://phab.mercurial-scm.org/D9076

Gregory Szorc - - Load All Authors

File last commit:

r43376:d783f945 default


                r46132:feffeb18

default

Download file

             __init__.py
        
                    13 lines
            
             | 416 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # __init__.py - Startup and module loading logic for Mercurial.

      #

      # Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>

      #

      # This software may be used and distributed according to the terms of the

      # GNU General Public License version 2 or any later version.

      from __future__ import absolute_import

      # Allow 'from mercurial import demandimport' to keep working.

      import hgdemandimport

      demandimport = hgdemandimport

	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

				# __init__.py - Startup and module loading logic for Mercurial.
				#
				# Copyright 2015 Gregory Szorc <gregory.szorc@gmail.com>
				#
				# This software may be used and distributed according to the terms of the
				# GNU General Public License version 2 or any later version.

				from __future__ import absolute_import

				# Allow 'from mercurial import demandimport' to keep working.
				import hgdemandimport

				demandimport = hgdemandimport