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

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:

r44486:ab595920 default


                r46207:588068d5

default

Download file

             __init__.py
        
                    8 lines
            
             | 300 B
            
                | text/x-python
            
             |
                PythonLexer
            
             / mercurial / revlogutils / __init__.py
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      # mercurial.revlogutils -- basic utilities for revlog

      #

      # Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net>

      #

      # 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

	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

				# mercurial.revlogutils -- basic utilities for revlog
				#
				# Copyright 2019 Pierre-Yves David <pierre-yves.david@octobus.net>
				#
				# 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