upstream/mercurial-mirror Files · mercurial/cext/revlog.h

merge: check for conflicting actions irrespective of length of bids...

merge: check for conflicting actions irrespective of length of bids We should for whether bids contain a combination of actions which conflict with each other. Since right now we only have couple of such combination, and combinations also consist of two actions, we were checking for them only when length of bids is 2. Let's check that irrespective of the length of bids.

marmoute - - Load All Authors

File last commit:

r44957:9db11679 default


                r46207:588068d5

default

Download file

             revlog.h
        
                    17 lines
            
             | 392 B
            
                | text/x-c
            
             |
                CLexer
            
             / mercurial / cext / revlog.h
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      /*

       revlog.h - efficient revlog parsing

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

       the GNU General Public License, incorporated herein by reference.

      */

      #ifndef _HG_REVLOG_H_

      #define _HG_REVLOG_H_

      #include <Python.h>

      extern PyTypeObject HgRevlogIndex_Type;

      #define HgRevlogIndex_Check(op) PyObject_TypeCheck(op, &HgRevlogIndex_Type)

      #endif /* _HG_REVLOG_H_ */

	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

				/*
				revlog.h - efficient revlog parsing

				This software may be used and distributed according to the terms of
				the GNU General Public License, incorporated herein by reference.
				*/

				#ifndef _HG_REVLOG_H_
				#define _HG_REVLOG_H_

				#include <Python.h>

				extern PyTypeObject HgRevlogIndex_Type;

				#define HgRevlogIndex_Check(op) PyObject_TypeCheck(op, &HgRevlogIndex_Type)

				#endif /* _HG_REVLOG_H_ */