upstream/mercurial-mirror Files · hgext/largefiles/CONTRIBUTORS

merge: don't overwrite untracked file at directory rename target...

merge: don't overwrite untracked file at directory rename target When a directory was renamed and a new untracked file was added in the new directory and the remote directory added a file by the same name in the old directory, the local untracked file gets overwritten, as demonstrated by the broken test case in test-rename-dir-merge. Fix by checking for unknown files for 'dg' actions too. Since _checkunknownfile() currently expects the same filename in both contexts, we need to add a new parameter for the remote filename to it.

various - - Load All Authors

File last commit:

r15168:cfccd3be default


                r23653:0297d846

default

Download file

             CONTRIBUTORS
        
                    4 lines
            
             | 172 B
            
                | text/plain
            
             |
                TextLexer

/ hgext / largefiles / CONTRIBUTORS

History | Source | Raw |Copy content |Copy permalink

various hgext: add largefiles extension...	r15168	Greg Ward, author of the original bfiles extension
		Na'Tosha Bard of Unity Technologies
		Fog Creek Software
		Special thanks to the University of Toronto and the UCOSP program

	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