upstream/mercurial-mirror Files · relnotes/next

repoview: only pin obsolete wdir parents while there are unresolved conflicts...

repoview: only pin obsolete wdir parents while there are unresolved conflicts I noticed after doing an update from an obsolete revision with a dirty wdir that the obsolete commit stayed visible for no obvious reason. It was decided in not to clear mergestate once all of the conflicts were resolved, in order to allow re-resolving. Since the point of pinning the obsolete parents was to allow resolving in the first place (aaeccdb6e654), it makes sense to also gate it on whether or not there are any remaining files to resolve. This might result in pinning again if files are marked unresolved again, but that seems reasonable, given that it still solves the original issue. Note that this isn't purely cosmetic- pushing with a pinned obsolete revision is likely to cause complaints about pushing multiple heads or other unexpected errors. So the faster it comes out of that state, the better. Differential Revision: https://phab.mercurial-scm.org/D9248

Yuya Nishihara - - Load All Authors

File last commit:

r46343:60d0634c stable


                r46383:341e014f

stable

Download file

             next
        
                    29 lines
            
             | 665 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
Yuya Nishihara relnotes: add diffcontains() to new features list	r46343	* New revset predicate `diffcontains(pattern)` for filtering revisions
		in the same way as `hg grep --diff pattern`.

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 ==

Martin von Zweigbergk merge: make low-level update() private (API)...	r46134	* `merge.update()` is now private (renamed to `_update()`). Hopefully
		the higher-level functions available in the same module cover your
		use cases.

	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