upstream/mercurial-mirror Files · tests/test-merge2.t

runtests: set web.ipv6 if we use IPv6...

runtests: set web.ipv6 if we use IPv6 As explained by the previous patch, we need to set "web.ipv6=True" if we decide to use IPv6. Otherwise "hg serve" will still try to listen on IPv4. This patch makes it so by appending web.ipv6 to "extra configs". This patch was tested in a Linux system with IPv6, by the following steps: 1. Change hgweb/server.py temporarily to write a file if IPv6HTTPServer.__init__ is called. 2. run-tests.py -l --keep-tmpdir test-serve.t 3. Check the generated .hgrc, make sure it sets web.ipv6=1. 4. Check the log file to make sure IPv6HTTPServer.__init__ is called.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r30986:f07ca071

default

Download file

             test-merge2.t
        
                    53 lines
            
             | 1.1 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge2.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init t

        $ cd t

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ rm b

        $ hg update 0

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

        $ echo This is file b2 > b

        $ hg add b

        $ hg commit -m "commit #2"

        created new head

        $ cd ..; rm -r t

        $ mkdir t

        $ cd t

        $ hg init

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ rm b

        $ hg update 0

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

        $ echo This is file b2 > b

        $ hg commit -A -m "commit #2"

        adding b

        created new head

        $ cd ..; rm -r t

        $ hg init t

        $ cd t

        $ echo This is file a1 > a

        $ hg add a

        $ hg commit -m "commit #0"

        $ echo This is file b1 > b

        $ hg add b

        $ hg commit -m "commit #1"

        $ rm b

        $ hg remove b

        $ hg update 0

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

        $ echo This is file b2 > b

        $ hg commit -A -m "commit #2"

        adding b

        created new head

        $ cd ..

	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 t
				$ cd t
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ rm b
				$ hg update 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo This is file b2 > b
				$ hg add b
				$ hg commit -m "commit #2"
				created new head
				$ cd ..; rm -r t

				$ mkdir t
				$ cd t
				$ hg init
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ rm b
				$ hg update 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo This is file b2 > b
				$ hg commit -A -m "commit #2"
				adding b
				created new head
				$ cd ..; rm -r t

				$ hg init t
				$ cd t
				$ echo This is file a1 > a
				$ hg add a
				$ hg commit -m "commit #0"
				$ echo This is file b1 > b
				$ hg add b
				$ hg commit -m "commit #1"
				$ rm b
				$ hg remove b
				$ hg update 0
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo This is file b2 > b
				$ hg commit -A -m "commit #2"
				adding b
				created new head

				$ cd ..