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

r26420:2fc86d92 default


                r32256:9bc36198

default

Download file

             test-issue1438.t
        
                    23 lines
            
             | 367 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue1438.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require symlink

        Adrian Buehlmann
    
tests: unify test-issue1438 and test-issue2137

              r12204
            
        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/1438

        Adrian Buehlmann
    
tests: unify test-issue1438 and test-issue2137

              r12204
            
        $ hg init

        $ ln -s foo link

        $ hg add link

        $ hg ci -mbad link

        $ hg rm link

        $ hg ci -mok

        $ hg diff -g -r 0:1 > bad.patch

        $ hg up 0

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

        $ hg import --no-commit bad.patch

        applying bad.patch

        $ hg status

        R link

        ? bad.patch

	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

Matt Mackall tests: replace exit 80 with #require	r22046	#require symlink
Adrian Buehlmann tests: unify test-issue1438 and test-issue2137	r12204
Matt Mackall urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/1438
Adrian Buehlmann tests: unify test-issue1438 and test-issue2137	r12204
		$ hg init

		$ ln -s foo link
		$ hg add link
		$ hg ci -mbad link
		$ hg rm link
		$ hg ci -mok
		$ hg diff -g -r 0:1 > bad.patch

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

		$ hg import --no-commit bad.patch
		applying bad.patch

		$ hg status
		R link
		? bad.patch