upstream/mercurial-mirror Files · tests/test-mq-qsave.t

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.

Adrian Buehlmann - - Load All Authors

File last commit:

r12324:b701610f default


                r22180:17011b36

stable

Download file

             test-mq-qsave.t
        
                    15 lines
            
             | 239 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-mq-qsave.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ echo "[extensions]" >> $HGRCPATH

        $ echo "mq=" >> $HGRCPATH

        $ hg init

        $ echo 'base' > base

        $ hg ci -Ambase

        adding base

        $ hg qnew -mmqbase mqbase

        $ hg qsave

        $ hg qrestore 2

        restoring status: hg patches saved state

	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

				$ echo "[extensions]" >> $HGRCPATH
				$ echo "mq=" >> $HGRCPATH

				$ hg init

				$ echo 'base' > base
				$ hg ci -Ambase
				adding base

				$ hg qnew -mmqbase mqbase

				$ hg qsave
				$ hg qrestore 2
				restoring status: hg patches saved state