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

r12346:3b165c12 default


                r22180:17011b36

stable

Download file

             test-empty-dir.t
        
                    23 lines
            
             | 397 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-empty-dir.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo 123 > a

        $ hg add a

        $ hg commit -m "first" a

        $ mkdir sub

        $ echo 321 > sub/b

        $ hg add sub/b

        $ hg commit -m "second" sub/b

        $ cat sub/b

        321

        $ hg co 0

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

        $ cat sub/b 2>/dev/null || echo "sub/b not present"

        sub/b not present

        $ test -d sub || echo "sub not present"

        sub not present

	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

				$ hg init

				$ echo 123 > a
				$ hg add a
				$ hg commit -m "first" a

				$ mkdir sub
				$ echo 321 > sub/b
				$ hg add sub/b
				$ hg commit -m "second" sub/b

				$ cat sub/b
				321

				$ hg co 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ cat sub/b 2>/dev/null \|\| echo "sub/b not present"
				sub/b not present

				$ test -d sub \|\| echo "sub not present"
				sub not present