upstream/mercurial-mirror Files · contrib/fuzz/pyutil.h

copies: handle a case when both merging csets are not descendant of merge base...

copies: handle a case when both merging csets are not descendant of merge base This patch fix the behaviour of fullcopytracing algorithm in the case when both the merging csets are not the descendant of merge base. Although it seems to be the rare case when both the csets are not descendant of merge base. But it can be seen in most of cases of content-divergence in evolve extension, where merge base is the common predecessor. Previous patch added a test where this algorithm can fail to continue because of an assumption that only one of the two csets can be dirty. This patch fix that error. For refrence I suggest you to look into the previous discussion held on a patch sent by Pulkit: https://phab.mercurial-scm.org/D3896 Differential Revision: https://phab.mercurial-scm.org/D5963

Augie Fackler - - Load All Authors

File last commit:

r41049:ef103c96 default


                r42098:7694b685

default

Download file

             pyutil.h
        
                    9 lines
            
             | 128 B
            
                | text/x-c
            
             |
                CLexer
            
             / contrib / fuzz / pyutil.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #include <Python.h>

      namespace contrib

      {

      void initpy(const char *cselfpath);

      PyObject *pyglobals();

      } /* namespace contrib */

	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

				#include <Python.h>

				namespace contrib
				{

				void initpy(const char *cselfpath);
				PyObject *pyglobals();

				} /* namespace contrib */