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

context: possibly yield initial fctx in blockdescendants()...

context: possibly yield initial fctx in blockdescendants() If initial 'fctx' has changes in line range with respect to its parents, we yield it first. This makes 'followlines(..., descend=True)' consistent with 'descendants()' revset which yields the starting revision. We reuse one iteration of blockancestors() which does exactly what we want. In test-annotate.t, adjust 'startrev' in one case to cover the situation where the starting revision does not touch specified line range.

Matt Mackall - - Load All Authors

File last commit:

r26420:2fc86d92 default


                r31992:3e47a40d

default

Download file

             test-issue612.t
        
                    34 lines
            
             | 624 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-issue612.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
urls: bulk-change BTS urls to new location

              r26420
            
      https://bz.mercurial-scm.org/612

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg init

        $ mkdir src

        $ echo a > src/a.c

        $ hg ci -Ama

        adding src/a.c

        $ hg mv src source

        Mads Kiilerich
    
tests: make (glob) on windows accept \ instead of /...

              r15447
            
        moving src/a.c to source/a.c (glob)

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        $ hg ci -Ammove

        $ hg co -C 0

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

        $ echo new > src/a.c

        $ echo compiled > src/a.o

        $ hg ci -mupdate

        created new head

        $ hg status

        ? src/a.o

        $ hg merge

        merging src/a.c and source/a.c to source/a.c

        Matt Mackall
    
merge: don't use unknown()...

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

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195
            
        (branch merge, don't forget to commit)

        $ hg status

        M source/a.c

        R src/a.c

        Matt Mackall
    
merge: don't use unknown()...

              r16094
            
        ? src/a.o

        Adrian Buehlmann
    
tests: unify test-issue*

              r12195

	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

Matt Mackall urls: bulk-change BTS urls to new location	r26420	https://bz.mercurial-scm.org/612
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg init
		$ mkdir src
		$ echo a > src/a.c
		$ hg ci -Ama
		adding src/a.c

		$ hg mv src source
Mads Kiilerich tests: make (glob) on windows accept \ instead of /...	r15447	moving src/a.c to source/a.c (glob)
Adrian Buehlmann tests: unify test-issue*	r12195
		$ hg ci -Ammove

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

		$ echo new > src/a.c
		$ echo compiled > src/a.o
		$ hg ci -mupdate
		created new head

		$ hg status
		? src/a.o

		$ hg merge
		merging src/a.c and source/a.c to source/a.c
Matt Mackall merge: don't use unknown()...	r16094	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
Adrian Buehlmann tests: unify test-issue*	r12195	(branch merge, don't forget to commit)

		$ hg status
		M source/a.c
		R src/a.c
Matt Mackall merge: don't use unknown()...	r16094	? src/a.o
Adrian Buehlmann tests: unify test-issue*	r12195