upstream/mercurial-mirror Files · tests/test-merge2.out

addremove: correctly handle intermediate symlinks...

addremove: correctly handle intermediate symlinks This fixes problems mentioned in issue660 comments (unrelated to original issue) where directory was renamed, and symlink was added instead. In such situation addremove wasn't able to correctly detect that old files no longer here, but tried to add symlink (and failed due collision with old files).

Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default


                r6651:7f0dd352

default

Download file

             test-merge2.out
        
                    8 lines
            
             | 276 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge2.out

History | Annotation | Raw |Copy content |Copy permalink

				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				created new head
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				adding b
				created new head
				0 files updated, 0 files merged, 0 files removed, 0 files unresolved
				adding b
				created new head

	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