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

doc: unify section level between help topics...

doc: unify section level between help topics Some help topics use "-" for the top level underlining section mark, but "-" is used also for the top level categorization in generated documents: "hg.1.html", for example. So, TOC in such documents contain "sections in each topics", too. This patch changes underlining section mark in some help topics to unify section level in generated documents. After this patching, levels of each section marks are: level0 """""" level1 ====== level2 ------ level3 ...... level4 ###### And use of section markers in each documents are: - mercurial/help/*.txt can use level1 or more (now these use level1 and level2) - help for core commands can use level2 or more (now these use no section marker) - descriptions of extensions can use level2 or more (now hgext/acl uses level2) - help for commands defined in extension can use level4 or more (now "convert" of hgext/convert uses level4) "Level0" is used as top level categorization only in "doc/hg.1.txt" and the intermediate file generated by "doc/gendoc.py", so end users don't see it in "hg help" outoput and so on.

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r17267:979b107e

stable

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 ..