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

update: teach hg to override untracked dir with a tracked file on update...

update: teach hg to override untracked dir with a tracked file on update This is a fix to an old problem when Mercurial got confused by an untracked folder with the same name as one of the files in a commit hg was trying to update to. It is pretty safe to remove this folder if it is empty. Backing up an empty folder seems to go against Mercurial's "don't track dirs" philosophy.

Matt Mackall - - Load All Authors

File last commit:

r22046:7a9cbb31 default


                r29480:1e4512ea

default

Download file

             test-no-symlinks.t
        
                    59 lines
            
             | 1.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-no-symlinks.t
          
                    History
                
                 |
                  Annotation
                 | Raw
                 |Copy content
                 |Copy permalink

      #require no-symlink

      # The following script was used to create the bundle:

      #

      # hg init symlinks

      # cd symlinks

      # echo a > a

      # mkdir d

      # echo b > d/b

      # ln -s a a.lnk

      # ln -s d/b d/b.lnk

      # hg ci -Am t

      # hg bundle --base null ../test-no-symlinks.hg

      Extract a symlink on a platform not supporting them

        $ hg init t

        $ cd t

        $ hg pull -q "$TESTDIR/bundles/test-no-symlinks.hg"

        $ hg update

        4 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cat a.lnk && echo

        a

        $ cat d/b.lnk && echo

        d/b

      Copy a symlink and move another

        $ hg copy a.lnk d/a2.lnk

        $ hg mv d/b.lnk b2.lnk

        $ hg ci -Am copy

        $ cat d/a2.lnk && echo

        a

        $ cat b2.lnk && echo

        d/b

      Bundle and extract again

        $ hg bundle --base null ../symlinks.hg

        2 changesets found

        $ cd ..

        $ hg init t2

        $ cd t2

        $ hg pull ../symlinks.hg

        pulling from ../symlinks.hg

        requesting all changes

        adding changesets

        adding manifests

        adding file changes

        added 2 changesets with 6 changes to 6 files

        (run 'hg update' to get a working copy)

        $ hg update

        5 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cat a.lnk && echo

        a

        $ cat d/a2.lnk && echo

        a

        $ cat b2.lnk && echo

        d/b

	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 no-symlink

				# The following script was used to create the bundle:
				#
				# hg init symlinks
				# cd symlinks
				# echo a > a
				# mkdir d
				# echo b > d/b
				# ln -s a a.lnk
				# ln -s d/b d/b.lnk
				# hg ci -Am t
				# hg bundle --base null ../test-no-symlinks.hg

				Extract a symlink on a platform not supporting them

				$ hg init t
				$ cd t
				$ hg pull -q "$TESTDIR/bundles/test-no-symlinks.hg"
				$ hg update
				4 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cat a.lnk && echo
				a
				$ cat d/b.lnk && echo
				d/b

				Copy a symlink and move another

				$ hg copy a.lnk d/a2.lnk
				$ hg mv d/b.lnk b2.lnk
				$ hg ci -Am copy
				$ cat d/a2.lnk && echo
				a
				$ cat b2.lnk && echo
				d/b

				Bundle and extract again

				$ hg bundle --base null ../symlinks.hg
				2 changesets found
				$ cd ..
				$ hg init t2
				$ cd t2
				$ hg pull ../symlinks.hg
				pulling from ../symlinks.hg
				requesting all changes
				adding changesets
				adding manifests
				adding file changes
				added 2 changesets with 6 changes to 6 files
				(run 'hg update' to get a working copy)
				$ hg update
				5 files updated, 0 files merged, 0 files removed, 0 files unresolved
				$ cat a.lnk && echo
				a
				$ cat d/a2.lnk && echo
				a
				$ cat b2.lnk && echo
				d/b