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

documentation: add some internals documentation about bid merge...

documentation: add some internals documentation about bid merge This is an important algorithm that was only documented on the wiki so far. Some update to the algorithm (and associated doc) is to expected in the future since the bid merge algorithm is bug-ridden when it comes to file deletion comes to play. Differential Revision: https://phab.mercurial-scm.org/D8711

Steven Stallion - - Load All Authors

File last commit:

r16489:cf137319 stable


                r45605:6c22f3ab

default

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