upstream/mercurial-mirror Files · tests/test-simplemerge.py.out

changectx: ancestor should only prefer merge.preferancestor if it is a revision...

changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

Pierre-Yves David - - Load All Authors

File last commit:

r22023:f1883065 default


                r22180:17011b36

stable

Download file

             test-simplemerge.py.out
        
                    5 lines
            
             | 119 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-simplemerge.py.out

History | Annotation | Raw |Copy content |Copy permalink

				....................
				----------------------------------------------------------------------
				Ran 20 tests in 0.000s

				OK

	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