upstream/mercurial-mirror Files · tests/test-update-names.t

merge: avoid superfluous filemerges when grafting through renames (issue5407)...

merge: avoid superfluous filemerges when grafting through renames (issue5407) This is a fix for a regression introduced by the patches for issue4028. The test changes are due to us doing fewer _checkcopies searches now, which makes some test outputs revert to the pre-issue4028 behavior. That issue itself remains fixed, we only skip copy tracing for files where it isn't relevant. As a nice side effect, this makes copy detection much faster when tracing backwards through lots of renames.

Stanislau Hlebik - - Load All Authors

File last commit:

r30172:90a6c18a default


                r30229:69ffbbe7

stable

Download file

             test-update-names.t
        
                    86 lines
            
             | 2.2 KiB
            
                | text/troff
            
             |
                Tads3Lexer
            
             / tests / test-update-names.t
          
                    History
                
                 |
                  Source
                 | Raw
                 |Copy content
                 |Copy permalink

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

              r29480
            
      Test update logic when there are renames or weird same-name cases between dirs

      and files

      Update with local changes across a file rename

        $ hg init r1 && cd r1

        $ echo a > a

        $ hg add a

        $ hg ci -m a

        $ hg mv a b

        $ hg ci -m rename

        $ echo b > b

        $ hg ci -m change

        $ hg up -q 0

        $ echo c > a

        $ hg up

        merging a and b to b

        warning: conflicts while merging b! (edit, then use 'hg resolve --mark')

        0 files updated, 0 files merged, 0 files removed, 1 files unresolved

        use 'hg resolve' to retry unresolved file merges

        [1]

      Test update when local untracked directory exists with the same name as a

      tracked file in a commit we are updating to

        $ hg init r2 && cd r2

        $ echo root > root && hg ci -Am root  # rev 0

        adding root

        $ echo text > name && hg ci -Am "name is a file"  # rev 1

        adding name

        $ hg up 0

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkdir name

        $ hg up 1

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

      Test update when local untracked directory exists with some files in it and has

      the same name a tracked file in a commit we are updating to. In future this

      should be updated to give an friendlier error message, but now we should just

      make sure that this does not erase untracked data

        $ hg up 0

        0 files updated, 0 files merged, 1 files removed, 0 files unresolved

        $ mkdir name

        $ echo text > name/file

        $ hg st

        ? name/file

        $ hg up 1

        abort: *: '$TESTTMP/r1/r2/name' (glob)

        [255]

        $ cd ..

        Kostia Balytskyi
    
update: fix bug when update tries to modify folder symlink...

              r29629
            
      #if symlink

      Test update when two commits have symlinks that point to different folders

        $ hg init r3 && cd r3

        $ echo root > root && hg ci -Am root

        adding root

        $ mkdir folder1 && mkdir folder2

        $ ln -s folder1 folder

        $ hg ci -Am "symlink to folder1"

        adding folder

        $ rm folder

        $ ln -s folder2 folder

        $ hg ci -Am "symlink to folder2"

        $ hg up 1

        1 files updated, 0 files merged, 0 files removed, 0 files unresolved

        $ cd ..

      #endif

        Stanislau Hlebik
    
update: warn if cwd was deleted...

              r30172
            
      Test that warning is printed if cwd is deleted during update

        $ hg init r4 && cd r4

        $ mkdir dir

        $ cd dir

        $ echo a > a

        $ echo b > b

        $ hg add a b

        $ hg ci -m "file and dir"

        $ hg up -q null

        current directory was removed

        (consider changing to repo root: $TESTTMP/r1/r4)

	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

Kostia Balytskyi update: teach hg to override untracked dir with a tracked file on update...	r29480	Test update logic when there are renames or weird same-name cases between dirs
		and files

		Update with local changes across a file rename

		$ hg init r1 && cd r1

		$ echo a > a
		$ hg add a
		$ hg ci -m a

		$ hg mv a b
		$ hg ci -m rename

		$ echo b > b
		$ hg ci -m change

		$ hg up -q 0

		$ echo c > a

		$ hg up
		merging a and b to b
		warning: conflicts while merging b! (edit, then use 'hg resolve --mark')
		0 files updated, 0 files merged, 0 files removed, 1 files unresolved
		use 'hg resolve' to retry unresolved file merges
		[1]

		Test update when local untracked directory exists with the same name as a
		tracked file in a commit we are updating to
		$ hg init r2 && cd r2
		$ echo root > root && hg ci -Am root # rev 0
		adding root
		$ echo text > name && hg ci -Am "name is a file" # rev 1
		adding name
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkdir name
		$ hg up 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved

		Test update when local untracked directory exists with some files in it and has
		the same name a tracked file in a commit we are updating to. In future this
		should be updated to give an friendlier error message, but now we should just
		make sure that this does not erase untracked data
		$ hg up 0
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		$ mkdir name
		$ echo text > name/file
		$ hg st
		? name/file
		$ hg up 1
		abort: *: '$TESTTMP/r1/r2/name' (glob)
		[255]
		$ cd ..
Kostia Balytskyi update: fix bug when update tries to modify folder symlink...	r29629
		#if symlink

		Test update when two commits have symlinks that point to different folders
		$ hg init r3 && cd r3
		$ echo root > root && hg ci -Am root
		adding root
		$ mkdir folder1 && mkdir folder2
		$ ln -s folder1 folder
		$ hg ci -Am "symlink to folder1"
		adding folder
		$ rm folder
		$ ln -s folder2 folder
		$ hg ci -Am "symlink to folder2"
		$ hg up 1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		$ cd ..

		#endif
Stanislau Hlebik update: warn if cwd was deleted...	r30172
		Test that warning is printed if cwd is deleted during update
		$ hg init r4 && cd r4
		$ mkdir dir
		$ cd dir
		$ echo a > a
		$ echo b > b
		$ hg add a b
		$ hg ci -m "file and dir"
		$ hg up -q null
		current directory was removed
		(consider changing to repo root: $TESTTMP/r1/r4)