upstream/mercurial-mirror Files · tests/test-issue842.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.

Matt Mackall - - Load All Authors

File last commit:

r15615:41885892 stable


                r22180:17011b36

stable

Download file

             test-issue842.t
        
                    39 lines
            
             | 734 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue842.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue842

        $ hg init

        $ echo foo > a

        $ hg ci -Ama

        adding a

        $ hg up -r0000

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ echo bar > a

      Should issue new head warning:

        $ hg ci -Amb

        adding a

        created new head

        $ hg up -r0000

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ echo stuffy > a

      Should not issue new head warning:

        $ hg ci -q -Amc

        $ hg up -r0000

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ echo crap > a

        $ hg branch testing

        marked working directory as branch testing

        (branches are permanent and global, did you want a bookmark?)

      Should not issue warning:

        $ hg ci -q -Amd

	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

				http://mercurial.selenic.com/bts/issue842

				$ hg init
				$ echo foo > a
				$ hg ci -Ama
				adding a

				$ hg up -r0000
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ echo bar > a

				Should issue new head warning:

				$ hg ci -Amb
				adding a
				created new head

				$ hg up -r0000
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ echo stuffy > a

				Should not issue new head warning:

				$ hg ci -q -Amc

				$ hg up -r0000
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ echo crap > a
				$ hg branch testing
				marked working directory as branch testing
				(branches are permanent and global, did you want a bookmark?)

				Should not issue warning:

				$ hg ci -q -Amd