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

changectx: ancestor should only prefer merge.preferancestor if it is a revision...

changectx: ancestor should only prefer merge.preferancestor if it is a revision The value '*' currently designates that bid merge should be used. The best way to test bid merge is to set preferancestor=* in the configuration file ... but then it would abort with unknown revision '*' when other code paths ended up in changectx.ancestor . Instead, just skip and ignore the value '*' when looking for a preferred ancestor.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r22180:17011b36

stable

Download file

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

        $ "$TESTDIR/hghave" symlink || exit 80

        $ 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

        $ "$TESTDIR/readlink.py" dangling

        dangling -> nothing

      tar

        $ cd "$origdir"

        $ tar xf archive.tar

        $ cd tar

        $ "$TESTDIR/readlink.py" dangling

        dangling -> nothing

      zip

        $ cd "$origdir"

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

        $ cd zip

        $ "$TESTDIR/readlink.py" dangling

        dangling -> nothing

        $ 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

				$ "$TESTDIR/hghave" symlink \|\| exit 80

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

				tar

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

				zip

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

				$ cd ..