upstream/mercurial-mirror Files · tests/bundles/test-merge-symlinks.hg

mq: avoid data loss upon qfold + qmv (issue3058)...

mq: avoid data loss upon qfold + qmv (issue3058) When renaming a patch A as B where B was previously qfolded into A and therefore marked as removed, a versioned MQ would first restore B before marking it as a copy of A, thus losing A changes. The undelete() call is probably a left-over, wctx.copy() explicitely handles the case where the destination is removed. Also note that status command represents "hg rm b; hg mv a b" as: A b a R a which explains the first hunk in test-mq-qrename.t.

Nicolas Dumazet - - Load All Authors

File last commit:

r14116:cd303243 default


                r15322:c8e2a5ea

stable

Download file

             test-merge-symlinks.hg
        
                    0 lines
            
             | 947 B
            
                | application/octet-stream
            
             |
                TextLexer

/ tests / bundles / test-merge-symlinks.hg

History | Annotation | Raw

Binary file (application/octet-stream)

	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