upstream/mercurial-mirror Files · tests/test-conflict.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.

Matt Mackall - - Load All Authors

File last commit:

r15501:2371f4ae default


                r17267:979b107e

stable

Download file

             test-conflict.t
        
                    33 lines
            
             | 732 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-conflict.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg init

        $ echo "nothing" > a

        $ hg add a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m ancestor

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ echo "something" > a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m branch1

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg co 0

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

        $ echo "something else" > a

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        $ hg commit -m branch2

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        created new head

        $ hg merge 1

        merging a

        warning: conflicts during merge.

        Matt Mackall
    
merge: give a special message for internal:merge failure (issue3105)

              r15501
            
        merging a incomplete! (edit conflicts, then use 'hg resolve --mark')

        Nicolas Dumazet
    
tests: unify test-conflict

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

        Brodie Rao
    
merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...

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

        Matt Mackall
    
tests: add exit codes to unified tests

              r12316
            
        [1]

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ hg id

        Martin Geisler
    
tests: remove unneeded -d flags...

              r12156
            
        32e80765d7fe+75234512624c+ tip

        Nicolas Dumazet
    
tests: unify test-conflict

              r11797
            
        $ cat a

        <<<<<<< local

        something else

        =======

        something

        >>>>>>> other

        $ hg status

        M a

        ? a.orig

	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

Nicolas Dumazet tests: unify test-conflict	r11797	$ hg init
		$ echo "nothing" > a
		$ hg add a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m ancestor
Nicolas Dumazet tests: unify test-conflict	r11797	$ echo "something" > a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m branch1
Nicolas Dumazet tests: unify test-conflict	r11797	$ hg co 0
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ echo "something else" > a
Martin Geisler tests: remove unneeded -d flags...	r12156	$ hg commit -m branch2
Nicolas Dumazet tests: unify test-conflict	r11797	created new head

		$ hg merge 1
		merging a
		warning: conflicts during merge.
Matt Mackall merge: give a special message for internal:merge failure (issue3105)	r15501	merging a incomplete! (edit conflicts, then use 'hg resolve --mark')
Nicolas Dumazet tests: unify test-conflict	r11797	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Brodie Rao merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'...	r12314	use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
Matt Mackall tests: add exit codes to unified tests	r12316	[1]
Nicolas Dumazet tests: unify test-conflict	r11797
		$ hg id
Martin Geisler tests: remove unneeded -d flags...	r12156	32e80765d7fe+75234512624c+ tip
Nicolas Dumazet tests: unify test-conflict	r11797
		$ cat a
		<<<<<<< local
		something else
		=======
		something
		>>>>>>> other

		$ hg status
		M a
		? a.orig