upstream/mercurial-mirror Files · contrib/plan9/proto

merge: do the trivial resolution after updating sparse checkout...

merge: do the trivial resolution after updating sparse checkout In merge, we do trivial resolution for files which were deleted on one side and changed on other. When sparse extension in involved that file might not be present in wdir and trivial resolution can lead to file not found error. This patch make sure we updates the sparse checkout before doing the trivial resolution. This fixes the test failure demonstrated in previous patch. Differential Revision: https://phab.mercurial-scm.org/D3984

Steven Stallion - - Load All Authors

File last commit:

r16489:cf137319 stable


                r39017:d49e490a

@94 stable

Download file

             proto
        
                    24 lines
            
             | 478 B
            
                | text/plain
            
             |
                ProtoBufLexer
            
             / contrib / plan9 / proto
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      lib	- sys sys

      	mercurial	- sys sys

      		hgrc.d	- sys sys

      			9diff.rc	- sys sys

      			factotum.rc	- sys sys

      rc	- sys sys

      	bin	- sys sys

      		9diff	- sys sys

      		hg	- sys sys

      sys	- sys sys

      	lib	- sys sys

      		python	- sys sys

      			lib	- sys sys

      				python2.5	- sys sys

      					site-packages	- sys sys

      						hgext	- sys sys

      							+	- sys sys

      						mercurial	- sys sys

      							+	- sys sys

      						mercurial-VERSION-py2.5.egg-info	- sys sys

      	src	- sys sys

      		cmd	- sys sys

      			hg	- sys sys

      				+	- sys sys

	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

				lib - sys sys
				mercurial - sys sys
				hgrc.d - sys sys
				9diff.rc - sys sys
				factotum.rc - sys sys
				rc - sys sys
				bin - sys sys
				9diff - sys sys
				hg - sys sys
				sys - sys sys
				lib - sys sys
				python - sys sys
				lib - sys sys
				python2.5 - sys sys
				site-packages - sys sys
				hgext - sys sys
				+ - sys sys
				mercurial - sys sys
				+ - sys sys
				mercurial-VERSION-py2.5.egg-info - sys sys
				src - sys sys
				cmd - sys sys
				hg - sys sys
				+ - sys sys