upstream/mercurial-mirror Files · tests/test-archive-symlinks.t

largefiles: restore standins according to restored dirstate...

largefiles: restore standins according to restored dirstate Before this patch, standins are restored from the NEW parent of the working directory at "hg rollback", and this causes: - standins removed in the rollback-ed revision are restored, and become orphan, because they are already marked as "R" in the restored dirstate and expected to be unlinked - standins added in the rollback-ed revision are left as they were before rollback, because they are not included in the new parent (this may not be so serious) This patch replaces the "merge.update" invocation with a specific implementation to restore standins according to restored dirstate. This is also the preparation to centralize the logic of updating largefiles into the function wrapping "merge.update" in the subsequent patch. After that patch, "merge.update" will also update largefiles in the working directory and be redundant for restoring standins only.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22285:85bded43

default

Download file

             test-archive-symlinks.t
        
                    40 lines
            
             | 676 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-archive-symlinks.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

        Matt Mackall
    
tests: replace exit 80 with #require

              r22046
            
      #require symlink

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        $ origdir=`pwd`

        $ hg init repo

        $ cd repo

        $ ln -s nothing dangling

      avoid tar warnings about old timestamp

        $ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink'

        $ hg archive -t files ../archive

        $ hg archive -t tar -p tar ../archive.tar

        $ hg archive -t zip -p zip ../archive.zip

      files

        $ cd "$origdir"

        $ cd archive

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

      tar

        $ cd "$origdir"

        $ tar xf archive.tar

        $ cd tar

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

      zip

        $ cd "$origdir"

        Matt Mackall
    
tests: suppress spurious lchmod error from unzip (issue4088)...

              r21216
            
        $ unzip archive.zip > /dev/null 2>&1

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        $ cd zip

        Thomas Arendsen Hein
    
tests: make tests work if directory contains special characters...

              r16350
            
        $ "$TESTDIR/readlink.py" dangling

        Martin Geisler
    
tests: unify test-archive-symlinks

              r11854
            
        dangling -> nothing

        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

Matt Mackall tests: replace exit 80 with #require	r22046	#require symlink
Martin Geisler tests: unify test-archive-symlinks	r11854
		$ origdir=`pwd`

		$ hg init repo
		$ cd repo
		$ ln -s nothing dangling

		avoid tar warnings about old timestamp

		$ hg ci -d '2000-01-01 00:00:00 +0000' -qAm 'add symlink'

		$ hg archive -t files ../archive
		$ hg archive -t tar -p tar ../archive.tar
		$ hg archive -t zip -p zip ../archive.zip

		files

		$ cd "$origdir"
		$ cd archive
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing

		tar

		$ cd "$origdir"
		$ tar xf archive.tar
		$ cd tar
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing

		zip

		$ cd "$origdir"
Matt Mackall tests: suppress spurious lchmod error from unzip (issue4088)...	r21216	$ unzip archive.zip > /dev/null 2>&1
Martin Geisler tests: unify test-archive-symlinks	r11854	$ cd zip
Thomas Arendsen Hein tests: make tests work if directory contains special characters...	r16350	$ "$TESTDIR/readlink.py" dangling
Martin Geisler tests: unify test-archive-symlinks	r11854	dangling -> nothing
Mads Kiilerich tests: add missing trailing 'cd ..'...	r16913
		$ cd ..