upstream/mercurial-mirror Files · tests/test-merge8.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).

Adrian Buehlmann - - Load All Authors

File last commit:

r6338:0750f111 default


                r6651:7f0dd352

default

Download file

             test-merge8.out
        
                    10 lines
            
             | 345 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge8.out

History | Source | Raw |Copy content |Copy permalink

Adrian Buehlmann clone: print "updating working directory" status message...	r6338	updating working directory
Thomas Arendsen Hein Test for ba7c74081861 (update dirstate correctly for non-branchmerge updates)...	r3389	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		pulling from ../a
		searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 2 changesets with 2 changes to 1 files
		(run 'hg update' to get a working copy)
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	1 files updated, 0 files merged, 1 files removed, 0 files unresolved

	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