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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r22180:17011b36

stable

Download file

             test-1102.t
        
                    17 lines
            
             | 354 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-1102.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ rm -rf a

        $ hg init a

        $ cd a

        $ echo a > a

        $ hg ci -Am0

        adding a

        $ hg tag t1 # 1

        $ hg tag --remove t1 # 2

        $ hg co 1

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

        $ hg tag -f -r0 t1

        $ hg tags

        tip                                3:a49829c4fc11

        t1                                 0:f7b1eb17ad24

        $ cd ..

	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

				$ rm -rf a
				$ hg init a
				$ cd a
				$ echo a > a
				$ hg ci -Am0
				adding a
				$ hg tag t1 # 1
				$ hg tag --remove t1 # 2

				$ hg co 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg tag -f -r0 t1
				$ hg tags
				tip 3:a49829c4fc11
				t1 0:f7b1eb17ad24

				$ cd ..