upstream/mercurial-mirror Files · tests/test-bad-pull.t

filemerge: show warning about choice of :prompt only at an actual fallback...

filemerge: show warning about choice of :prompt only at an actual fallback Before this patch, internal merge tool :prompt shows "no tool found to merge FILE" line, even if :prompt is explicitly specified as a tool to be used. This patch shows warning message about choice of :prompt only at an actual fallback, in which case any tool is rejected by capability for binary or symlink. It is for backward compatibility to omit warning message in "changedelete" case.

Augie Fackler - - Load All Authors

File last commit:

r29514:28052824 default


                r32253:7d4ce4b5

default

Download file

             test-bad-pull.t
        
                    15 lines
            
             | 325 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-bad-pull.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require serve killdaemons

        $ hg clone http://localhost:$HGPORT/ copy

        abort: * (glob)

        [255]

        $ test -d copy

        [1]

        $ python "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid

        $ cat dumb.pid >> $DAEMON_PIDS

        $ hg clone http://localhost:$HGPORT/foo copy2

        abort: HTTP Error 404: * (glob)

        [255]

        $ killdaemons.py

	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

				#require serve killdaemons

				$ hg clone http://localhost:$HGPORT/ copy
				abort: * (glob)
				[255]

				$ test -d copy
				[1]

				$ python "$TESTDIR/dumbhttp.py" -p $HGPORT --pid dumb.pid
				$ cat dumb.pid >> $DAEMON_PIDS
				$ hg clone http://localhost:$HGPORT/foo copy2
				abort: HTTP Error 404: * (glob)
				[255]
				$ killdaemons.py