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

parsers: add a C function to pack the dirstate...

parsers: add a C function to pack the dirstate This is about 9 times faster than the Python dirstate packing code. The relatively small speedup is due to the poor locality and memory access patterns caused by traversing dicts and other boxed Python values.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r16955:92e1c64b

default

Download file

             test-resolve.t
        
                    46 lines
            
             | 853 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-resolve.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      test that a commit clears the merge state.

        $ hg init repo

        $ cd repo

        $ echo foo > file

        $ hg commit -Am 'add file'

        adding file

        $ echo bar >> file

        $ hg commit -Am 'append bar'

      create a second head

        $ hg up -C 0

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

        $ echo baz >> file

        $ hg commit -Am 'append baz'

        created new head

      failing merge

        $ hg merge --tool=internal:fail

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

        use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon

        [1]

        $ echo resolved > file

        $ hg resolve -m file

        $ hg commit -m 'resolved'

      resolve -l, should be empty

        $ hg resolve -l

      test crashed merge with empty mergestate

        $ mkdir .hg/merge

        $ touch .hg/merge/state

      resolve -l, should be empty

        $ hg resolve -l

        $ 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

				test that a commit clears the merge state.

				$ hg init repo
				$ cd repo

				$ echo foo > file
				$ hg commit -Am 'add file'
				adding file

				$ echo bar >> file
				$ hg commit -Am 'append bar'


				create a second head

				$ hg up -C 0
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ echo baz >> file
				$ hg commit -Am 'append baz'
				created new head

				failing merge

				$ hg merge --tool=internal:fail
				0 files updated, 0 files merged, 0 files removed, 1 files unresolved
				use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
				[1]

				$ echo resolved > file
				$ hg resolve -m file
				$ hg commit -m 'resolved'

				resolve -l, should be empty

				$ hg resolve -l

				test crashed merge with empty mergestate

				$ mkdir .hg/merge
				$ touch .hg/merge/state

				resolve -l, should be empty

				$ hg resolve -l

				$ cd ..