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

filemerge: show warning about choice of :prompt only at an actual fallback...

filemerge: show warning about choice of :prompt only at an actual fallback Before this patch, internal merge tool :prompt shows "no tool found to merge FILE" line, even if :prompt is explicitly specified as a tool to be used. This patch shows warning message about choice of :prompt only at an actual fallback, in which case any tool is rejected by capability for binary or symlink. It is for backward compatibility to omit warning message in "changedelete" case.

Augie Fackler - - Load All Authors

File last commit:

r29844:c4d03b6d default


                r32253:7d4ce4b5

default

Download file

             test-archive-symlinks.t
        
                    42 lines
            
             | 665 B
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-archive-symlinks.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require symlink

        $ 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

        $ readlink.py dangling

        dangling -> nothing

      tar

        $ cd "$origdir"

        $ tar xf archive.tar

        $ cd tar

        $ readlink.py dangling

        dangling -> nothing

      #if unziplinks

      zip

        $ cd "$origdir"

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

        $ cd zip

        $ readlink.py dangling

        dangling -> nothing

      #endif

        $ 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

				#require symlink

				$ 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
				$ readlink.py dangling
				dangling -> nothing

				tar

				$ cd "$origdir"
				$ tar xf archive.tar
				$ cd tar
				$ readlink.py dangling
				dangling -> nothing

				#if unziplinks
				zip

				$ cd "$origdir"
				$ unzip archive.zip > /dev/null 2>&1
				$ cd zip
				$ readlink.py dangling
				dangling -> nothing
				#endif

				$ cd ..