upstream/mercurial-mirror Files · tests/test-clone-update-order.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:

r15615:41885892 stable


                r17267:979b107e

stable

Download file

             test-clone-update-order.t
        
                    105 lines
            
             | 3.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-clone-update-order.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

        $ hg init

        $ echo foo > bar

        $ hg commit -Am default

        adding bar

        $ hg up -r null

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

        $ hg branch mine

        marked working directory as branch mine

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

        $ echo hello > world

        $ hg commit -Am hello

        adding world

        $ hg up -r null

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

        $ hg branch other

        marked working directory as branch other

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

        $ echo good > bye

        $ hg commit -Am other

        adding bye

        $ hg up -r mine

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

        $ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other

        abort: cannot specify both --noupdate and --updaterev

        [255]

        $ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        $ rm -rf ../b

        $ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch mine

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

        $ rm -rf ../b

        $ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch default

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

        $ rm -rf ../b

        $ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch mine

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

        $ rm -rf ../b

        $ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch other

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

        $ rm -rf ../b

      Test -r mine ... mine is ignored:

        $ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch other

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

        $ rm -rf ../b

        $ hg clone .#other ../b -b default -b mine

        adding changesets

        adding manifests

        adding file changes

        added 3 changesets with 3 changes to 3 files (+2 heads)

        updating to branch default

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

        $ rm -rf ../b

        $ hg clone .#other ../b

        adding changesets

        adding manifests

        adding file changes

        added 1 changesets with 1 changes to 1 files

        updating to branch other

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

        $ rm -rf ../b

        $ hg clone -U . ../c -r 1 -r 2 > /dev/null

        $ hg clone ../c ../b

        updating to branch other

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

        $ rm -rf ../b ../c

	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 foo > bar
				$ hg commit -Am default
				adding bar
				$ hg up -r null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg branch mine
				marked working directory as branch mine
				(branches are permanent and global, did you want a bookmark?)
				$ echo hello > world
				$ hg commit -Am hello
				adding world
				$ hg up -r null
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				$ hg branch other
				marked working directory as branch other
				(branches are permanent and global, did you want a bookmark?)
				$ echo good > bye
				$ hg commit -Am other
				adding bye
				$ hg up -r mine
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved

				$ hg clone -U -u . .#other ../b -r 0 -r 1 -r 2 -b other
				abort: cannot specify both --noupdate and --updaterev
				[255]

				$ hg clone -U .#other ../b -r 0 -r 1 -r 2 -b other
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 3 files (+2 heads)
				$ rm -rf ../b

				$ hg clone -u . .#other ../b -r 0 -r 1 -r 2 -b other
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 3 files (+2 heads)
				updating to branch mine
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm -rf ../b

				$ hg clone -u 0 .#other ../b -r 0 -r 1 -r 2 -b other
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 3 files (+2 heads)
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm -rf ../b

				$ hg clone -u 1 .#other ../b -r 0 -r 1 -r 2 -b other
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 3 files (+2 heads)
				updating to branch mine
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm -rf ../b

				$ hg clone -u 2 .#other ../b -r 0 -r 1 -r 2 -b other
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 3 files (+2 heads)
				updating to branch other
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm -rf ../b

				Test -r mine ... mine is ignored:

				$ hg clone -u 2 .#other ../b -r mine -r 0 -r 1 -r 2 -b other
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 3 files (+2 heads)
				updating to branch other
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm -rf ../b

				$ hg clone .#other ../b -b default -b mine
				adding changesets
				adding manifests
				adding file changes
				added 3 changesets with 3 changes to 3 files (+2 heads)
				updating to branch default
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm -rf ../b

				$ hg clone .#other ../b
				adding changesets
				adding manifests
				adding file changes
				added 1 changesets with 1 changes to 1 files
				updating to branch other
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm -rf ../b

				$ hg clone -U . ../c -r 1 -r 2 > /dev/null
				$ hg clone ../c ../b
				updating to branch other
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ rm -rf ../b ../c