upstream/mercurial-mirror Files · relnotes/next

commit: clear mergestate also with --amend (issue6304)...

commit: clear mergestate also with --amend (issue6304) The `hg commit --amend` uses the in-memory code, which naturally doesn't touch the merge state (well, it shouldn't anyway; I think I've fixed bugs in that area recently). We therefore need to clear the mergestate after calling `repo.commitctx()` since we expect that from `hg commit --amend`. Differential Revision: https://phab.mercurial-scm.org/D8932

Martin von Zweigbergk - - Load All Authors

File last commit:

r45928:5178dd22 default


                r45948:6ba7190f

default

Download file

             next
        
                    22 lines
            
             | 388 B
            
                | text/plain
            
             |
                TextLexer

/ relnotes / next

History | Source | Raw |Copy content |Copy permalink

Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== New Features ==

Martin von Zweigbergk rename: add support for --at-rev, which marks as copy and removes the source...	r45928	* `hg mv -A` can now be used with `--at-rev`. It behaves just like
		`hg cp -A --at-rev`, i.e. it marks the destination as a copy of the
		source whether or not the source still exists (but the source must
		exist in the parent revision).
Joerg Sonnenberger relnotes: extend...	r45729
Manuel Jacob relnotes: make spacing before new section consistent...	r45762
Martin von Zweigbergk copy: add experimental support for marking committed copies...	r44847	== New Experimental Features ==
Martin von Zweigbergk revset: add a revset for parents in merge state...	r44817
Manuel Jacob relnotes: add release notes for relevant changes I did since the 5.4 release...	r45764

		== Bug Fixes ==


Manuel Jacob relnotes: make spacing before new section consistent...	r45762
Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== Backwards Compatibility Changes ==

Manuel Jacob relnotes: add release notes for relevant changes I did since the 5.4 release...	r45764
Martin von Zweigbergk debugmergestate: make templated...	r44880
Martin von Zweigbergk releasenotes: add a file in which to record release notes...	r42457	== Internal API Changes ==

	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