upstream/mercurial-mirror Files · tests/test-empty-dir.t

debugcommands: add debugpickmergetool to examine which merge tool is chosen...

debugcommands: add debugpickmergetool to examine which merge tool is chosen Before this patch, there is no convenient way to know which merge tool is chosen for each managed files without actual merging.

Matt Mackall - - Load All Authors

File last commit:

r12346:3b165c12 default


                r32256:9bc36198

default

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