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

merge: define conflict marker labels in filemerge()...

merge: define conflict marker labels in filemerge() Moves the conflict marker definition up to filemerge, so it gets applied to all merge strategies, and so in a future patch we can manipulate the markers.

Adrian Buehlmann - - Load All Authors

File last commit:

r17019:5d053859 default


                r21273:20b8090d

default

Download file

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

        $ "$TESTDIR/hghave" serve || exit 80

      #if windows

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

        abort: * (glob)

        [255]

      #else

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

        abort: error: Connection refused

        [255]

      #endif

        $ test -d copy

        [1]

        $ cat > dumb.py <<EOF

        > import BaseHTTPServer, SimpleHTTPServer, os, signal

        > def run(server_class=BaseHTTPServer.HTTPServer,

        >         handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):

        >     server_address = ('localhost', int(os.environ['HGPORT']))

        >     httpd = server_class(server_address, handler_class)

        >     open("listening", "w")

        >     httpd.handle_request()

        > run()

        > EOF

        $ python dumb.py 2> log &

        $ P=$!

        $ while [ ! -f listening ]; do sleep 0; done

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

        abort: HTTP Error 404: * (glob)

        [255]

        $ wait $P

	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

				$ "$TESTDIR/hghave" serve \|\| exit 80

				#if windows
				$ hg clone http://localhost:$HGPORT/ copy
				abort: * (glob)
				[255]
				#else
				$ hg clone http://localhost:$HGPORT/ copy
				abort: error: Connection refused
				[255]
				#endif

				$ test -d copy
				[1]

				$ cat > dumb.py <<EOF
				> import BaseHTTPServer, SimpleHTTPServer, os, signal
				> def run(server_class=BaseHTTPServer.HTTPServer,
				> handler_class=SimpleHTTPServer.SimpleHTTPRequestHandler):
				> server_address = ('localhost', int(os.environ['HGPORT']))
				> httpd = server_class(server_address, handler_class)
				> open("listening", "w")
				> httpd.handle_request()
				> run()
				> EOF

				$ python dumb.py 2> log &
				$ P=$!
				$ while [ ! -f listening ]; do sleep 0; done
				$ hg clone http://localhost:$HGPORT/foo copy2
				abort: HTTP Error 404: * (glob)
				[255]
				$ wait $P