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

Mads Kiilerich - - Load All Authors

File last commit:

r16913:f2719b38 default


                r31992:3e47a40d

default

Download file

             test-import-unknown.t
        
                    69 lines
            
             | 1.4 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-import-unknown.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Patrick Mezard
    
patch: do not patch unknown files (issue752)

              r14453
            
        $ cat <<EOF >> $HGRCPATH

        > [extensions]

        > purge =

        > EOF

        $ hg init test

        $ cd test

        $ echo a > changed

        $ echo a > removed

        $ echo a > source

        $ hg ci -Am addfiles

        adding changed

        adding removed

        adding source

        $ echo a >> changed

        $ echo a > added

        $ hg add added

        $ hg rm removed

        $ hg cp source copied

        $ hg diff --git > ../unknown.diff

      Test adding on top of an unknown file

        $ hg up -qC 0

        $ hg purge

        $ echo a > added

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        file added already exists

        1 out of 1 hunks FAILED -- saving rejects to file added.rej

        abort: patch failed to apply

        [255]

      Test modifying an unknown file

        $ hg revert -aq

        $ hg purge

        $ hg rm changed

        $ hg ci -m removechanged

        $ echo a > changed

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot patch changed: file is not tracked

        [255]

      Test removing an unknown file

        $ hg up -qC 0

        $ hg purge

        $ hg rm removed

        $ hg ci -m removeremoved

        created new head

        $ echo a > removed

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot patch removed: file is not tracked

        [255]

      Test copying onto an unknown file

        $ hg up -qC 0

        $ hg purge

        $ echo a > copied

        $ hg import --no-commit ../unknown.diff

        applying ../unknown.diff

        abort: cannot create copied: destination already exists

        [255]

        Mads Kiilerich
    
tests: add missing trailing 'cd ..'...

              r16913
            
        $ 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

Patrick Mezard patch: do not patch unknown files (issue752)	r14453	$ cat <<EOF >> $HGRCPATH
		> [extensions]
		> purge =
		> EOF

		$ hg init test
		$ cd test
		$ echo a > changed
		$ echo a > removed
		$ echo a > source
		$ hg ci -Am addfiles
		adding changed
		adding removed
		adding source
		$ echo a >> changed
		$ echo a > added
		$ hg add added
		$ hg rm removed
		$ hg cp source copied
		$ hg diff --git > ../unknown.diff

		Test adding on top of an unknown file

		$ hg up -qC 0
		$ hg purge
		$ echo a > added
		$ hg import --no-commit ../unknown.diff
		applying ../unknown.diff
		file added already exists
		1 out of 1 hunks FAILED -- saving rejects to file added.rej
		abort: patch failed to apply
		[255]

		Test modifying an unknown file

		$ hg revert -aq
		$ hg purge
		$ hg rm changed
		$ hg ci -m removechanged
		$ echo a > changed
		$ hg import --no-commit ../unknown.diff
		applying ../unknown.diff
		abort: cannot patch changed: file is not tracked
		[255]

		Test removing an unknown file

		$ hg up -qC 0
		$ hg purge
		$ hg rm removed
		$ hg ci -m removeremoved
		created new head
		$ echo a > removed
		$ hg import --no-commit ../unknown.diff
		applying ../unknown.diff
		abort: cannot patch removed: file is not tracked
		[255]

		Test copying onto an unknown file

		$ hg up -qC 0
		$ hg purge
		$ echo a > copied
		$ hg import --no-commit ../unknown.diff
		applying ../unknown.diff
		abort: cannot create copied: destination already exists
		[255]
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..