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

histedit: make check for unresolved conflicts explicit (issue5545)...

histedit: make check for unresolved conflicts explicit (issue5545) Previously, we'd rely on the implicit check that `localrepo.commit` did. The problem is that that check only happened when the working copy was dirty. With a "clean" working copy but unresolved conflicts we'd get into a broken state. To fix that, do what rebase does and check for unresolved conflicts at the start of histedit --continue.

Nicolas Dumazet - - Load All Authors

File last commit:

r14116:cd303243 default


                r32057:e5ffc91a

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