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

tests: remove 'hghave symlink' from test-import-git.t...

tests: remove 'hghave symlink' from test-import-git.t The test had a long chain of commits depending on execbits in some of first commits. The hashes are checked throughout the file, so there was no elegant way to make it pass both with and without execbits. We now rollback the execbits-or-not commits and make a stable change instead. The hash chain is thus updated once but is now a bit more stable. The test coverage should be unaltered.

Brendan Cully - - Load All Authors

File last commit:

r14485:610873cf default


                r16910:ad229181

default

Download file

             test-merge5.t
        
                    37 lines
            
             | 1012 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-merge5.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo This is file a1 > a

        $ echo This is file b1 > b

        $ hg add a b

        $ hg commit -m "commit #0"

        $ echo This is file b22 > b

        $ hg commit -m "comment #1"

        $ hg update 0

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

        $ rm b

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

        removing b

        created new head

        $ hg update 1

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

        $ hg update

        abort: crosses branches (merge branches or update --check to force update)

        [255]

        $ hg update -c

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

        $ mv a c

      In theory, we shouldn't need the "-y" below, but it prevents this test

      from hanging when "hg update" erroneously prompts the user for "keep

      or delete".

      Should abort:

        $ hg update -y 1

        abort: crosses branches (merge branches or use --clean to discard changes)

        [255]

        $ mv c a

      Should succeed:

        $ hg update -y 1

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

	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 This is file a1 > a
				$ echo This is file b1 > b
				$ hg add a b
				$ hg commit -m "commit #0"
				$ echo This is file b22 > b
				$ hg commit -m "comment #1"
				$ hg update 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm b
				$ hg commit -A -m "comment #2"
				removing b
				created new head
				$ hg update 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg update
				abort: crosses branches (merge branches or update --check to force update)
				[255]
				$ hg update -c
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ mv a c

				In theory, we shouldn't need the "-y" below, but it prevents this test
				from hanging when "hg update" erroneously prompts the user for "keep
				or delete".

				Should abort:

				$ hg update -y 1
				abort: crosses branches (merge branches or use --clean to discard changes)
				[255]
				$ mv c a

				Should succeed:

				$ hg update -y 1
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved