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

hgweb: add block numbers to diff regions and related links...

hgweb: add block numbers to diff regions and related links The changeset view may show several diff regions, one per file, and this patch numbers each of them so that links produced by the filenodelink fragment can reference each diff region produced by the diffblock fragment through the use of the blockno variable made available to both of them. This permits navigation to diff regions on the changeset page from the file list, and where the :target pseudo-class is supported in browsers, permits selective presentation of diffs, showing one at a time instead of potentially many in what would otherwise be a very long page that is difficult to navigate.

Matt Mackall - - Load All Authors

File last commit:

r15615:41885892 stable


                r16308:2695aaf4

default

Download file

             test-issue619.t
        
                    30 lines
            
             | 629 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue619.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      http://mercurial.selenic.com/bts/issue619

        $ hg init

        $ echo a > a

        $ hg ci -Ama

        adding a

        $ echo b > b

        $ hg branch b

        marked working directory as branch b

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

        $ hg ci -Amb

        adding b

        $ hg co -C 0

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

      Fast-forward:

        $ hg merge b

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

        (branch merge, don't forget to commit)

        $ hg ci -Ammerge

      Bogus fast-forward should fail:

        $ hg merge b

        abort: merging with a working directory ancestor has no effect

        [255]

	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

				http://mercurial.selenic.com/bts/issue619

				$ hg init
				$ echo a > a
				$ hg ci -Ama
				adding a

				$ echo b > b
				$ hg branch b
				marked working directory as branch b
				(branches are permanent and global, did you want a bookmark?)
				$ hg ci -Amb
				adding b

				$ hg co -C 0
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved

				Fast-forward:

				$ hg merge b
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				$ hg ci -Ammerge

				Bogus fast-forward should fail:

				$ hg merge b
				abort: merging with a working directory ancestor has no effect
				[255]