upstream/mercurial-mirror Files · tests/test-branch-tag-confict.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-branch-tag-confict.t
        
                    65 lines
            
             | 1.6 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-branch-tag-confict.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      Initial setup.

        $ hg init repo

        $ cd repo

        $ touch thefile

        $ hg ci -A -m 'Initial commit.'

        adding thefile

      Create a tag.

        $ hg tag branchortag

      Create a branch with the same name as the tag.

        $ hg branch branchortag

        marked working directory as branch branchortag

        (branches are permanent and global, did you want a bookmark?)

        $ hg ci -m 'Create a branch with the same name as a tag.'

      This is what we have:

        $ hg log

        changeset:   2:10519b3f489a

        branch:      branchortag

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Create a branch with the same name as a tag.

        changeset:   1:2635c45ca99b

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Added tag branchortag for changeset f57387372b5d

        changeset:   0:f57387372b5d

        tag:         branchortag

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Initial commit.

      Update to the tag:

        $ hg up 'tag(branchortag)'

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

        $ hg parents

        changeset:   0:f57387372b5d

        tag:         branchortag

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Initial commit.

      Updating to the branch:

        $ hg up 'branch(branchortag)'

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

        $ hg parents

        changeset:   2:10519b3f489a

        branch:      branchortag

        tag:         tip

        user:        test

        date:        Thu Jan 01 00:00:00 1970 +0000

        summary:     Create a branch with the same name as a tag.

        $ 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

				Initial setup.

				$ hg init repo
				$ cd repo
				$ touch thefile
				$ hg ci -A -m 'Initial commit.'
				adding thefile

				Create a tag.

				$ hg tag branchortag

				Create a branch with the same name as the tag.

				$ hg branch branchortag
				marked working directory as branch branchortag
				(branches are permanent and global, did you want a bookmark?)
				$ hg ci -m 'Create a branch with the same name as a tag.'

				This is what we have:

				$ hg log
				changeset: 2:10519b3f489a
				branch: branchortag
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Create a branch with the same name as a tag.

				changeset: 1:2635c45ca99b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Added tag branchortag for changeset f57387372b5d

				changeset: 0:f57387372b5d
				tag: branchortag
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Initial commit.

				Update to the tag:

				$ hg up 'tag(branchortag)'
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg parents
				changeset: 0:f57387372b5d
				tag: branchortag
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Initial commit.

				Updating to the branch:

				$ hg up 'branch(branchortag)'
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ hg parents
				changeset: 2:10519b3f489a
				branch: branchortag
				tag: tip
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				summary: Create a branch with the same name as a tag.


				$ cd ..